luci: remove android_coverage configuration.

Also fix bucket ordering after yesterday's prefix removal.

Change-Id: Ic17c93305993be7506dd6decfc75ec04854ee7b9
Reviewed-on: https://chromium-review.googlesource.com/c/1372649
Reviewed-by: Shuotao Gao <stgao@chromium.org>
Commit-Queue: John Budorick <jbudorick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#615668}

infra/config/global/cr-buildbucket.cfg

@@ -2868,6 +2868,73 @@ buckets {
   }
 }
 
+buckets {
+  name: "master.chromium.android.fyi"
+  acl_sets: "waterfall"
+}
+
+buckets {
+  name: "master.chromium.perf"
+  acl_sets: "waterfall"
+}
+
+buckets {
+  name: "master.chromium.perf.fyi"
+  acl_sets: "waterfall"
+}
+
+# Defining blink build bucket in chromium/src repo because
+# blink will merge to chromium/src.
+# Also git admins are reluctant to create infra/config branches
+# in svn-based git repos (crbug.com/513580).
+buckets {
+  name: "master.tryserver.blink"
+  acl_sets: "tryserver"
+}
+
+buckets {
+  name: "master.tryserver.chromium.android"
+  acl_sets: "tryserver"
+}
+
+buckets {
+  name: "master.tryserver.chromium.chromiumos"
+  acl_sets: "tryserver"
+}
+
+buckets {
+  name: "master.tryserver.chromium.gpu"
+  acl_sets: "tryserver"
+}
+
+buckets {
+  name: "master.tryserver.chromium.linux"
+  acl_sets: "tryserver"
+}
+
+buckets {
+  name: "master.tryserver.chromium.mac"
+  acl_sets: "tryserver"
+}
+
+buckets {
+  name: "master.tryserver.chromium.perf"
+  acl_sets: "tryserver"
+  acls {
+    role: SCHEDULER
+    group: "service-account-chromium-bisect"
+  }
+  acls {
+    role: SCHEDULER
+    group: "service-account-chromeperf"
+  }
+}
+
+buckets {
+  name: "master.tryserver.chromium.win"
+  acl_sets: "tryserver"
+}
+
 buckets {
   name: "try"
 
@@ -3344,11 +3411,6 @@ buckets {
       dimensions: "os:Ubuntu-14.04"
       mixins: "android-try"
     }
-    builders {
-      name: "android_coverage"
-      dimensions: "os:Ubuntu-14.04"
-      mixins: "android-try"
-    }
     builders {
       name: "linux_android_dbg_ng"
       dimensions: "os:Ubuntu-14.04"
@@ -3540,70 +3602,3 @@ buckets {
     builders { mixins: "win" name: "WebRTC Chromium FYI Win8 Tester" }
   }
 }
-
-buckets {
-  name: "master.chromium.android.fyi"
-  acl_sets: "waterfall"
-}
-
-buckets {
-  name: "master.chromium.perf"
-  acl_sets: "waterfall"
-}
-
-buckets {
-  name: "master.chromium.perf.fyi"
-  acl_sets: "waterfall"
-}
-
-# Defining blink build bucket in chromium/src repo because
-# blink will merge to chromium/src.
-# Also git admins are reluctant to create infra/config branches
-# in svn-based git repos (crbug.com/513580).
-buckets {
-  name: "master.tryserver.blink"
-  acl_sets: "tryserver"
-}
-
-buckets {
-  name: "master.tryserver.chromium.android"
-  acl_sets: "tryserver"
-}
-
-buckets {
-  name: "master.tryserver.chromium.chromiumos"
-  acl_sets: "tryserver"
-}
-
-buckets {
-  name: "master.tryserver.chromium.gpu"
-  acl_sets: "tryserver"
-}
-
-buckets {
-  name: "master.tryserver.chromium.linux"
-  acl_sets: "tryserver"
-}
-
-buckets {
-  name: "master.tryserver.chromium.mac"
-  acl_sets: "tryserver"
-}
-
-buckets {
-  name: "master.tryserver.chromium.perf"
-  acl_sets: "tryserver"
-  acls {
-    role: SCHEDULER
-    group: "service-account-chromium-bisect"
-  }
-  acls {
-    role: SCHEDULER
-    group: "service-account-chromeperf"
-  }
-}
-
-buckets {
-  name: "master.tryserver.chromium.win"
-  acl_sets: "tryserver"
-}

infra/config/global/luci-milo.cfg

@@ -3986,9 +3986,6 @@ consoles {
   builders {
     name: "buildbot/tryserver.chromium.android/android_compile_x86_dbg"
   }
-  builders {
-    name: "buildbucket/luci.chromium.try/android_coverage"
-  }
   builders {
     name: "buildbucket/luci.chromium.try/android_cronet"
   }