Revert of Extend chromium_tests trigger to work across masters.

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

Index: scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Builder__dbg_.json
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Builder__dbg_.json b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Builder__dbg_.json
index 68a4538760c609a2da6352ee14a84c9c134df34d..79e07540e9188e1cd659d2338948a904e8e00bcf 100644
--- a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Builder__dbg_.json
+++ b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Builder__dbg_.json
@@ -370,7 +370,6 @@
     "name": "trigger",
     "trigger_specs": [
       {
-        "bucket": "master.chromium.fyi",
         "builder_name": "Android Coverage (dbg)",
         "properties": {
           "parent_got_angle_revision": "fac9503c46405f77757b9a728eb85b8d7bc6080c",
@@ -386,9 +385,17 @@
           "parent_got_webrtc_revision": "0f90628433546e61d9268596da93418c623137f4",
           "parent_got_webrtc_revision_cp": "refs/heads/master@{#120644}"
         }
-      },
+      }
+    ],
+    "~followup_annotations": [
+      "@@@STEP_TEXT@Android Coverage (dbg)@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "trigger (2)",
+    "trigger_specs": [
       {
-        "bucket": "master.chromium.fyi",
         "builder_name": "Android Remoting Tests",
         "properties": {
           "parent_got_angle_revision": "fac9503c46405f77757b9a728eb85b8d7bc6080c",
@@ -404,9 +411,17 @@
           "parent_got_webrtc_revision": "0f90628433546e61d9268596da93418c623137f4",
           "parent_got_webrtc_revision_cp": "refs/heads/master@{#120644}"
         }
-      },
+      }
+    ],
+    "~followup_annotations": [
+      "@@@STEP_TEXT@Android Remoting Tests@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "trigger (3)",
+    "trigger_specs": [
       {
-        "bucket": "master.chromium.fyi",
         "builder_name": "Android Tests (amp instrumentation test split)",
         "properties": {
           "parent_got_angle_revision": "fac9503c46405f77757b9a728eb85b8d7bc6080c",
@@ -422,9 +437,17 @@
           "parent_got_webrtc_revision": "0f90628433546e61d9268596da93418c623137f4",
           "parent_got_webrtc_revision_cp": "refs/heads/master@{#120644}"
         }
-      },
+      }
+    ],
+    "~followup_annotations": [
+      "@@@STEP_TEXT@Android Tests (amp instrumentation test split)@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "trigger (4)",
+    "trigger_specs": [
       {
-        "bucket": "master.chromium.fyi",
         "builder_name": "Android Tests (amp split)",
         "properties": {
           "parent_got_angle_revision": "fac9503c46405f77757b9a728eb85b8d7bc6080c",
@@ -440,9 +463,17 @@
           "parent_got_webrtc_revision": "0f90628433546e61d9268596da93418c623137f4",
           "parent_got_webrtc_revision_cp": "refs/heads/master@{#120644}"
         }
-      },
+      }
+    ],
+    "~followup_annotations": [
+      "@@@STEP_TEXT@Android Tests (amp split)@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "trigger (5)",
+    "trigger_specs": [
       {
-        "bucket": "master.chromium.fyi",
         "builder_name": "Android Tests (trial)(dbg)",
         "properties": {
           "parent_got_angle_revision": "fac9503c46405f77757b9a728eb85b8d7bc6080c",
@@ -461,7 +492,7 @@
       }
     ],
     "~followup_annotations": [
-      "@@@STEP_TEXT@Android Coverage (dbg)<br />Android Remoting Tests<br />Android Tests (amp instrumentation test split)<br />Android Tests (amp split)<br />Android Tests (trial)(dbg)@@@"
+      "@@@STEP_TEXT@Android Tests (trial)(dbg)@@@"
     ]
   },
   {