Add buildbucket configs for Android GPU FYI, ANGLE and optional GPU bots

BUG=811812
BUG=811804
BUG=811803
BUG=811863
BUG=811816
BUG=811786
BUG=811782
BUG=819960
BUG=819959
BUG=731979
BUG=731958
BUG=731958

Change-Id: I6b2778332e7d29c7cd2d9144cea0949e9bde47ca
Reviewed-on: https://chromium-review.googlesource.com/957525Reviewed-by: Kenneth Russell <kbr@chromium.org>
Reviewed-by: Nodir Turakulov <nodir@chromium.org>
Reviewed-by: John Budorick <jbudorick@chromium.org>
Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#542282}

infra/config/global/cr-buildbucket.cfg

@@ -114,6 +114,31 @@ builder_mixins {
   }
 }
 
+builder_mixins {
+  name: "android-angle-try"
+  dimensions: "cores:8"
+  dimensions: "cpu:x86-64"
+  dimensions: "os:Ubuntu-14.04"
+  mixins: "angle-try"
+}
+
+builder_mixins {
+  name: "android-gpu-fyi-ci"
+  dimensions: "cores:8"
+  dimensions: "cpu:x86-64"
+  dimensions: "os:Ubuntu-14.04"
+  mixins: "gpu-fyi-ci"
+}
+
+builder_mixins {
+  name: "android-optional-gpu-try"
+  dimensions: "cores:8"
+  dimensions: "cpu:x86-64"
+  dimensions: "os:Ubuntu-14.04"
+  mixins: "gpu-optional-try"
+  mixins: "android-try"
+}
+
 builder_mixins {
   name: "angle-try"
   service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -328,6 +353,51 @@ buckets {
       execution_timeout_secs: 14400  # 4h
     }
 
+    builders {
+      name: "Android FYI 32 Vk Release (Nexus 5X)"
+      mixins: "android-gpu-fyi-ci"
+    }
+
+    builders {
+      name: "Android FYI 64 Vk Release (Nexus 5X)"
+      mixins: "android-gpu-fyi-ci"
+    }
+
+    builders {
+      name: "Android FYI dEQP Release (Nexus 5X)"
+      mixins: "android-gpu-fyi-ci"
+    }
+
+    builders {
+      name: "Android FYI Release (Nexus 5)"
+      mixins: "android-gpu-fyi-ci"
+    }
+
+    builders {
+      name: "Android FYI Release (Nexus 5X)"
+      mixins: "android-gpu-fyi-ci"
+    }
+
+    builders {
+      name: "Android FYI Release (Nexus 6)"
+      mixins: "android-gpu-fyi-ci"
+    }
+
+    builders {
+      name: "Android FYI Release (Nexus 6P)"
+      mixins: "android-gpu-fyi-ci"
+    }
+
+    builders {
+      name: "Android FYI Release (Nexus 9)"
+      mixins: "android-gpu-fyi-ci"
+    }
+
+    builders {
+      name: "Android FYI Release (NVIDIA Shield TV)"
+      mixins: "android-gpu-fyi-ci"
+    }
+
     builders {
       name: "Android x64 Builder (dbg)"
       mixins: "android-ci"
@@ -802,6 +872,8 @@ buckets {
     }
 
     # Keep builders sorted by OS, then name.
+    builders { mixins: "android-angle-try" name: "android_angle_rel_ng" }
+    builders { mixins: "android-angle-try" name: "android_angle_deqp_rel_ng" }
     builders {
       mixins: "android-try"
       name: "android_arm64_dbg_recipe"
@@ -814,6 +886,7 @@ buckets {
       dimensions: "os:Ubuntu-14.04"
       dimensions: "cores:8"
     }
+    builders { mixins: "android-optional-gpu-try" name: "android_optional_gpu_tests_rel" }
 
     builders { mixins: "linux-try" name: "cast_shell_audio_linux" }
     builders { mixins: "linux-try" name: "cast_shell_linux" }