Recipe changes for chormium.android.fyi master

scripts/slave/recipes/chromium.expected/full_chromium_android_Android_arm_Builder__dbg_.json

Index: scripts/slave/recipes/chromium.expected/full_chromium_android_Android_arm_Builder__dbg_.json
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_android_Android_arm_Builder__dbg_.json b/scripts/slave/recipes/chromium.expected/full_chromium_android_Android_arm_Builder__dbg_.json
index 90ebe00818be79f470164d0d5e809637436f07e8..b2c7951fa45b40911325d640065399ab4411a648 100644
--- a/scripts/slave/recipes/chromium.expected/full_chromium_android_Android_arm_Builder__dbg_.json
+++ b/scripts/slave/recipes/chromium.expected/full_chromium_android_Android_arm_Builder__dbg_.json
@@ -271,16 +271,6 @@
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"Jelly Bean Tester\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"gtest_tests\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"swarming\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@          \"can_use_on_swarming_builders\": true@@@",
-      "@@@STEP_LOG_LINE@json.output@        }, @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"test\": \"browser_tests\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"KitKat Tablet Tester\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"gtest_tests\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
@@ -291,16 +281,6 @@
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"Lollipop Low-end Tester\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"gtest_tests\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"swarming\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@          \"can_use_on_swarming_builders\": true@@@",
-      "@@@STEP_LOG_LINE@json.output@        }, @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"test\": \"browser_tests\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"Lollipop Phone Tester\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"gtest_tests\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
@@ -598,26 +578,6 @@
         }
       },
       {
-        "builder_name": "Jelly Bean Tester",
-        "properties": {
-          "parent_got_angle_revision": "fac9503c46405f77757b9a728eb85b8d7bc6080c",
-          "parent_got_angle_revision_cp": "refs/heads/master@{#297276}",
-          "parent_got_buildtools_revision": "f0319a328b2809876916353cb994259692140934",
-          "parent_got_buildtools_revision_cp": "refs/heads/master@{#182578}",
-          "parent_got_nacl_revision": "d998e125e8253980d76e269b7982aeeefc1b9b50",
-          "parent_got_nacl_revision_cp": "refs/heads/master@{#274981}",
-          "parent_got_revision": "f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
-          "parent_got_revision_cp": "refs/heads/master@{#170242}",
-          "parent_got_swarming_client_revision": "a0ee5d99f1d4b38ddaa4c759c837980b63b99566",
-          "parent_got_swarming_client_revision_cp": "refs/heads/master@{#276089}",
-          "parent_got_v8_revision": "801ada225ddc271c132c3a35f03975671d43e399",
-          "parent_got_v8_revision_cp": "refs/heads/master@{#43426}",
-          "parent_got_webrtc_revision": "0f90628433546e61d9268596da93418c623137f4",
-          "parent_got_webrtc_revision_cp": "refs/heads/master@{#120644}",
-          "parent_mastername": "chromium.android"
-        }
-      },
-      {
         "builder_name": "KitKat Tablet Tester",
         "properties": {
           "parent_got_angle_revision": "fac9503c46405f77757b9a728eb85b8d7bc6080c",
@@ -638,7 +598,7 @@
         }
       },
       {
-        "builder_name": "Lollipop Low-end Tester",
+        "builder_name": "Lollipop Phone Tester",
         "properties": {
           "parent_got_angle_revision": "fac9503c46405f77757b9a728eb85b8d7bc6080c",
           "parent_got_angle_revision_cp": "refs/heads/master@{#297276}",
@@ -658,7 +618,7 @@
         }
       },
       {
-        "builder_name": "Lollipop Phone Tester",
+        "builder_name": "Lollipop Tablet Tester",
         "properties": {
           "parent_got_angle_revision": "fac9503c46405f77757b9a728eb85b8d7bc6080c",
           "parent_got_angle_revision_cp": "refs/heads/master@{#297276}",
@@ -678,7 +638,7 @@
         }
       },
       {
-        "builder_name": "Lollipop Tablet Tester",
+        "builder_name": "Marshmallow Tablet Tester",
         "properties": {
           "parent_got_angle_revision": "fac9503c46405f77757b9a728eb85b8d7bc6080c",
           "parent_got_angle_revision_cp": "refs/heads/master@{#297276}",
@@ -698,7 +658,8 @@
         }
       },
       {
-        "builder_name": "Marshmallow Tablet Tester",
+        "bucket": "master.chromium.android.fyi",
+        "builder_name": "Jelly Bean Tester",
         "properties": {
           "parent_got_angle_revision": "fac9503c46405f77757b9a728eb85b8d7bc6080c",
           "parent_got_angle_revision_cp": "refs/heads/master@{#297276}",
@@ -719,7 +680,7 @@
       }
     ],
     "~followup_annotations": [
-      "@@@STEP_TEXT@Android WebView CTS L-MR1 (dbg)<br />Android Webview L (dbg)<br />Android Webview M (dbg)<br />Jelly Bean Tester<br />KitKat Tablet Tester<br />Lollipop Low-end Tester<br />Lollipop Phone Tester<br />Lollipop Tablet Tester<br />Marshmallow Tablet Tester@@@"
+      "@@@STEP_TEXT@Android WebView CTS L-MR1 (dbg)<br />Android Webview L (dbg)<br />Android Webview M (dbg)<br />Jelly Bean Tester<br />KitKat Tablet Tester<br />Lollipop Phone Tester<br />Lollipop Tablet Tester<br />Marshmallow Tablet Tester@@@"
     ]
   },
   {