Revert of chromium_tests: Fix new android compile triggering

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

Index: scripts/slave/recipes/chromium.expected/full_chromium_perf_Android_Builder.json
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_perf_Android_Builder.json b/scripts/slave/recipes/chromium.expected/full_chromium_perf_Android_Builder.json
index a50a8c38b635510c68309bad4bb12a310bcc15bc..2ae2b11837535e84b411a900e5bc0234649effa3 100644
--- a/scripts/slave/recipes/chromium.expected/full_chromium_perf_Android_Builder.json
+++ b/scripts/slave/recipes/chromium.expected/full_chromium_perf_Android_Builder.json
@@ -503,6 +503,66 @@
         }
       },
       {
+        "builder_name": "Android Nexus5X Perf (1)",
+        "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.perf"
+        }
+      },
+      {
+        "builder_name": "Android Nexus5X Perf (2)",
+        "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.perf"
+        }
+      },
+      {
+        "builder_name": "Android Nexus5X Perf (3)",
+        "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.perf"
+        }
+      },
+      {
         "builder_name": "Android Nexus6 Perf (1)",
         "properties": {
           "parent_got_angle_revision": "fac9503c46405f77757b9a728eb85b8d7bc6080c",
@@ -684,7 +744,7 @@
       }
     ],
     "~followup_annotations": [
-      "@@@STEP_TEXT@Android Galaxy S5 Perf (1)<br />Android Galaxy S5 Perf (2)<br />Android Galaxy S5 Perf (3)<br />Android Nexus5 Perf (1)<br />Android Nexus5 Perf (2)<br />Android Nexus5 Perf (3)<br />Android Nexus6 Perf (1)<br />Android Nexus6 Perf (2)<br />Android Nexus6 Perf (3)<br />Android Nexus7v2 Perf (1)<br />Android Nexus7v2 Perf (2)<br />Android Nexus7v2 Perf (3)<br />Android One Perf (1)<br />Android One Perf (2)<br />Android One Perf (3)@@@"
+      "@@@STEP_TEXT@Android Galaxy S5 Perf (1)<br />Android Galaxy S5 Perf (2)<br />Android Galaxy S5 Perf (3)<br />Android Nexus5 Perf (1)<br />Android Nexus5 Perf (2)<br />Android Nexus5 Perf (3)<br />Android Nexus5X Perf (1)<br />Android Nexus5X Perf (2)<br />Android Nexus5X Perf (3)<br />Android Nexus6 Perf (1)<br />Android Nexus6 Perf (2)<br />Android Nexus6 Perf (3)<br />Android Nexus7v2 Perf (1)<br />Android Nexus7v2 Perf (2)<br />Android Nexus7v2 Perf (3)<br />Android One Perf (1)<br />Android One Perf (2)<br />Android One Perf (3)@@@"
     ]
   },
   {