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

masters/master.client.webrtc.perf/slaves.cfg

Index: masters/master.client.webrtc.perf/slaves.cfg
diff --git a/masters/master.client.webrtc.perf/slaves.cfg b/masters/master.client.webrtc.perf/slaves.cfg
index 9f567fedf0efcb864d18f5ed1c24cb46d12dd8d5..64041d7a732e8e373aa80e32dd79c14d0a68fa20 100644
--- a/masters/master.client.webrtc.perf/slaves.cfg
+++ b/masters/master.client.webrtc.perf/slaves.cfg
@@ -3,49 +3,62 @@
 # found in the LICENSE file.
 
 slaves = [
-  # Bare-metal Linux 64-bit machines.
+  # Linux 64-bit
   {
-    'master': 'WebRTCPerf',
+    'master': 'WebRTC',

[kjellander_chromium, 2016/10/07 07:07:15]

Sneaky thing here: the 'master' needs to be 'WebRTCPerf' now.
Same below

     'os': 'linux',
     'version': 'trusty',
     'bits': '64',
     'builder': [
-      'Linux Trusty',
+      'Android32 Builder',
+      'Android64 Builder',
     ],
-    'hostname': 'webrtc-perf-linux-baremetal-tbd-1',
+    'hostname': 'slave78-c3',
   },
-  # VM that builds the Android builds.
+  # Bare-metal Linux 64-bit machines with Android devices connected.
+] + [
   {
-    'master': 'WebRTCPerf',
+    'master': 'WebRTC',
     'os': 'linux',
     'version': 'trusty',
     'bits': '64',
     'builder': [
-      'Android32 Builder',
-      'Android64 Builder',
+      'Android32 Tests (L Nexus5)',
     ],
-    'hostname': 'webrtc-perf-linux-vm-tbd',
-  },
-  # Bare-metal Linux machines with Android devices connected.
+    'hostname': 'build%d-b3' % i,
+  } for i in range(18, 20)
+] + [
   {
-    'master': 'WebRTCPerf',
+    'master': 'WebRTC',
+    'os': 'linux',
+    'version': 'trusty',
+    'bits': '64',
+    'builder': [
+      'Android32 Tests (L Nexus7.2)',
+    ],
+    'hostname': 'build%d-b3' % i,
+  } for i in range(21, 23)
+] + [
+  {
+    'master': 'WebRTC',
     'os': 'linux',
     'version': 'trusty',
     'bits': '64',
     'builder': [
-      'Android32 Tests (M Nexus5X)',
+      'Android64 Tests (L Nexus9)',
     ],
-    'hostname': 'webrtc-perf-linux-baremetal-tbd-2',
+    'hostname': 'build17-b3',
   },
+  # Bare-metal Linux 64-bit machines.
   {
     'master': 'WebRTCPerf',
     'os': 'linux',
     'version': 'trusty',
     'bits': '64',
     'builder': [
-      'Android64 Tests (M Nexus9)',
+      'Linux Trusty',
     ],
-    'hostname': 'webrtc-perf-linux-baremetal-tbd-3',
+    'hostname': 'webrtc-perf-linux-baremetal-tbd-1',
   },
   # Mac.
   {