WebRTC: Move Android bots with devices to the perf waterfall.

scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_perf_android32_builder_forced.json

Index: scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_perf_android32_builder_forced.json
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_fyi_android32_builder.json b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_perf_android32_builder_forced.json
similarity index 92%
copy from scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_fyi_android32_builder.json
copy to scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_perf_android32_builder_forced.json
index 3f167eb64b5d694215890b84447fe927fc613921..6f253dc3eca74f37cfa9d05b0410ed0e5dbaa8f8 100644
--- a/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_fyi_android32_builder.json
+++ b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_perf_android32_builder_forced.json
@@ -37,7 +37,7 @@
       "--output_json",
       "/path/to/tmp/json",
       "--revision",
-      "src@12345",
+      "src@HEAD",
       "--output_manifest"
     ],
     "cwd": "[BUILDER_CACHE]/Android32_Builder",
@@ -50,7 +50,7 @@
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"did_run\": true, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"fixed_revisions\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"src\": \"12345\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"src\": \"HEAD\"@@@",
       "@@@STEP_LOG_LINE@json.output@  }, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"manifest\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"src\": {@@@",
@@ -189,7 +189,7 @@
       "[BUILDER_CACHE]/Android32_Builder/src/tools/mb/mb.py",
       "gen",
       "-m",
-      "client.webrtc.fyi",
+      "client.webrtc.perf",
       "-b",
       "Android32 Builder",
       "--config-file",
@@ -226,7 +226,7 @@
       "--buildbot-buildername",
       "Android32 Builder",
       "--buildbot-mastername",
-      "client.webrtc.fyi",
+      "client.webrtc.perf",
       "--buildbot-slavename",
       "slavename",
       "--goma-deps-cache-file",
@@ -269,13 +269,13 @@
       "--src-dir",
       "[BUILDER_CACHE]/Android32_Builder/src",
       "--build-url",
-      "gs://chromium-webrtc/client.webrtc.fyi/Android32 Builder",
+      "gs://chromium-webrtc/client.webrtc.perf/Android32 Builder",
       "--build_revision",
       "f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
       "--factory-properties",
-      "{\"BUILD_CONFIG\": \"Release\", \"buildername\": \"Android32 Builder\", \"buildnumber\": 1337, \"mastername\": \"client.webrtc.fyi\", \"path_config\": \"kitchen\", \"recipe\": \"webrtc/standalone\", \"revision\": \"12345\", \"slavename\": \"slavename\"}",
+      "{\"BUILD_CONFIG\": \"Release\", \"buildername\": \"Android32 Builder\", \"buildnumber\": 1337, \"mastername\": \"client.webrtc.perf\", \"path_config\": \"kitchen\", \"recipe\": \"webrtc/standalone\", \"slavename\": \"slavename\"}",
       "--build-properties",
-      "{\"BUILD_CONFIG\": \"Release\", \"buildername\": \"Android32 Builder\", \"buildnumber\": 1337, \"mastername\": \"client.webrtc.fyi\", \"path_config\": \"kitchen\", \"recipe\": \"webrtc/standalone\", \"revision\": \"12345\", \"slavename\": \"slavename\"}"
+      "{\"BUILD_CONFIG\": \"Release\", \"buildername\": \"Android32 Builder\", \"buildnumber\": 1337, \"mastername\": \"client.webrtc.perf\", \"path_config\": \"kitchen\", \"recipe\": \"webrtc/standalone\", \"slavename\": \"slavename\"}"
     ],
     "name": "package build"
   },
@@ -284,7 +284,7 @@
     "name": "trigger",
     "trigger_specs": [
       {
-        "builder_name": "Android32 Tests (J Nexus4)",
+        "builder_name": "Android32 Tests (L Nexus5)",
         "properties": {
           "parent_got_revision": "f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
           "parent_got_revision_cp": "refs/heads/master@{#170242}",
@@ -292,15 +292,7 @@
         }
       },
       {
-        "builder_name": "Android32 Tests (K Nexus5)",
-        "properties": {
-          "parent_got_revision": "f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
-          "parent_got_revision_cp": "refs/heads/master@{#170242}",
-          "revision": "f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9"
-        }
-      },
-      {
-        "builder_name": "Android32 Tests (L Nexus6)",
+        "builder_name": "Android32 Tests (L Nexus7.2)",
         "properties": {
           "parent_got_revision": "f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
           "parent_got_revision_cp": "refs/heads/master@{#170242}",
@@ -309,7 +301,7 @@
       }
     ],
     "~followup_annotations": [
-      "@@@STEP_TEXT@Android32 Tests (J Nexus4)<br />Android32 Tests (K Nexus5)<br />Android32 Tests (L Nexus6)@@@"
+      "@@@STEP_TEXT@Android32 Tests (L Nexus5)<br />Android32 Tests (L Nexus7.2)@@@"
     ]
   },
   {