Move some non-tree closing bots on chromium.android to chromium.android.fyi

masters/master.chromium.android/builders.pyl

Index: masters/master.chromium.android/builders.pyl
diff --git a/masters/master.chromium.android/builders.pyl b/masters/master.chromium.android/builders.pyl
index a21626b6637d03a2e1a9fd754786848182e067f8..f362b2dd5e7c5427f39dab78d16cf549786c392d 100644
--- a/masters/master.chromium.android/builders.pyl
+++ b/masters/master.chromium.android/builders.pyl
@@ -193,16 +193,6 @@
       "category": "4Swarming",
       "slavebuilddir": "android_build",
     },
-    "Jelly Bean Tester": {
-      "recipe": "chromium",
-      "remote_run_sync_revision": True,
-      "remote_run_use_gitiles": True,
-      "use_remote_run": True,
-      "scheduler": None,
-      "slave_pools": ["jelly_bean_tester"],
-      "category": "3Testers",
-      "mergeRequests": True,
-    },
     "KitKat Tablet Tester": {
       "recipe": "chromium",
       "remote_run_sync_revision": True,
@@ -213,26 +203,6 @@
       "category": "3Testers",
       "mergeRequests": True,
     },
-    "Lollipop Consumer Tester": {
-      "recipe": "chromium",
-      "remote_run_sync_revision": True,
-      "remote_run_use_gitiles": True,
-      "use_remote_run": True,
-      "scheduler": None,
-      "slave_pools": ["lollipop_consumer"],
-      "category": "3Testers",
-      "mergeRequests": True,
-    },
-    "Lollipop Low-end Tester": {
-      "recipe": "chromium",
-      "remote_run_sync_revision": True,
-      "remote_run_use_gitiles": True,
-      "use_remote_run": True,
-      "scheduler": None,
-      "slave_pools": ["lollipop_low_end"],
-      "category": "3Testers",
-      "mergeRequests": True,
-    },
     "Lollipop Phone Tester": {
       "recipe": "chromium",
       "remote_run_sync_revision": True,
@@ -243,36 +213,6 @@
       "category": "3Testers",
       "mergeRequests": True,
     },
-    "Lollipop Tablet Tester": {
-      "recipe": "chromium",
-      "remote_run_sync_revision": True,
-      "remote_run_use_gitiles": True,
-      "use_remote_run": True,
-      "scheduler": None,
-      "slave_pools": ["lollipop_tablet"],
-      "category": "3Testers",
-      "mergeRequests": True,
-    },
-    "Marshmallow 64 bit Tester": {
-      "recipe": "chromium",
-      "remote_run_sync_revision": True,
-      "remote_run_use_gitiles": True,
-      "use_remote_run": True,
-      "scheduler": None,
-      "slave_pools": ["marshmallow_64"],
-      "category": "3Testers",
-      "mergeRequests": True,
-    },
-    "Marshmallow Tablet Tester": {
-      "recipe": "chromium",
-      "remote_run_sync_revision": True,
-      "remote_run_use_gitiles": True,
-      "use_remote_run": True,
-      "scheduler": None,
-      "slave_pools": ["marshmallow_tablet"],
-      "category": "3Testers",
-      "mergeRequests": True,
-    },
   },
 
   "schedulers": {
@@ -382,14 +322,6 @@
       },
       "slaves": ["build88-b1"],
     },
-    "jelly_bean_tester": {
-      "slave_data": {
-        "os": "linux",
-        "version": "trusty",
-        "bits": "64",
-      },
-      "slaves": ["build40-b1"],
-    },
     "kit_kat_tablet": {
       "slave_data": {
         "os": "linux",
@@ -398,22 +330,6 @@
       },
       "slaves": ["build42-b1"],
     },
-    "lollipop_consumer": {
-      "slave_data": {
-        "os": "linux",
-        "version": "trusty",
-        "bits": "64",
-      },
-      "slaves": ["build39-b1"],
-    },
-    "lollipop_low_end": {
-      "slave_data": {
-        "os": "linux",
-        "version": "trusty",
-        "bits": "64",
-      },
-      "slaves": ["build19-b1"],
-    },
     "lollipop_phone": {
       "slave_data": {
         "os": "linux",
@@ -422,14 +338,6 @@
       },
       "slaves": ["slave145-c1"],
     },
-    "lollipop_tablet": {
-      "slave_data": {
-        "os": "linux",
-        "version": "trusty",
-        "bits": "64",
-      },
-      "slaves": ["build43-b1"],
-    },
     "main_n5x_builder": {
       "slave_data": {
         "os": "linux",
@@ -438,22 +346,6 @@
       },
       "slaves": ["slave76-c1"],
     },
-    "marshmallow_64": {
-      "slave_data": {
-        "os": "linux",
-        "version": "trusty",
-        "bits": "64",
-      },
-      "slaves": ["slave46-c1"],
-    },
-    "marshmallow_tablet": {
-      "slave_data": {
-        "os": "linux",
-        "version": "trusty",
-        "bits": "64",
-      },
-      "slaves": ["build44-b1"],
-    },
     "mips_builder": {
       "slave_data": {
         "os": "linux",