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

masters/master.client.webrtc/slaves.cfg

Index: masters/master.client.webrtc/slaves.cfg
diff --git a/masters/master.client.webrtc/slaves.cfg b/masters/master.client.webrtc/slaves.cfg
index 4f9dcaaba64a6f9e4c310d166f83bfab1726d00c..190947f7de31ed152d92a534193f0ddd03ec32f1 100644
--- a/masters/master.client.webrtc/slaves.cfg
+++ b/masters/master.client.webrtc/slaves.cfg
@@ -10,17 +10,17 @@ slaves = [
     'version': 'trusty',
     'bits': '64',
     'builder': [
-      'Android32 Builder',
-      'Android32 Builder (dbg)',
       'Android32 Builder x86',
       'Android32 Builder x86 (dbg)',
       'Android32 Builder MIPS (dbg)',
       'Android32 Clang (dbg)',
-      'Android64 Builder',
-      'Android64 Builder (dbg)',
       'Android64 Builder x64 (dbg)',
       'Android32 GYP',
       'Android32 GYP (dbg)',
+      'Android32 (M Nexus5X)',
+      'Android32 (M Nexus5X)(dbg)',
+      'Android64 (M Nexus5X)',
+      'Android64 (M Nexus5X)(dbg)',
       'Linux32 ARM',
       'Linux32 Debug',
       'Linux32 Release',
@@ -36,21 +36,7 @@ slaves = [
       'Linux UBSan vptr',
     ],
     'hostname': 'slave%d-c3' % i,
-  } for i in range(13, 21) + [78]
-] + [
-  {
-    'master': 'WebRTC',
-    'os': 'linux',
-    'version': 'trusty',
-    'bits': '64',
-    'builder': [
-      'Android32 Tests (M Nexus5X)',
-      'Android32 Tests (M Nexus5X)(dbg)',
-      'Android64 Tests (M Nexus5X)',
-      'Android64 Tests (M Nexus5X)(dbg)',
-    ],
-    'hostname': 'slave%d-c3' % i,
-  } for i in range(6, 10)
+  } for i in range(6, 10) + range(13, 21)
 ] + [
   {
     'master': 'WebRTC',
@@ -74,59 +60,6 @@ slaves = [
     'hostname': 'build7-b3',
   }
 ] + [
-  # Bare-metal Linux 64-bit machines with Android devices connected.
-  {
-    'master': 'WebRTC',
-    'os': 'linux',
-    'version': 'trusty',
-    'bits': '64',
-    'builder': [
-      'Android32 Tests (L Nexus5)',
-    ],
-    'hostname': 'build18-b3',
-  },
-  {
-    'master': 'WebRTC',
-    'os': 'linux',
-    'version': 'trusty',
-    'bits': '64',
-    'builder': [
-      'Android32 Tests (L Nexus5)(dbg)',
-    ],
-    'hostname': 'build19-b3',
-  },
-] + [
-  {
-    'master': 'WebRTC',
-    'os': 'linux',
-    'version': 'trusty',
-    'bits': '64',
-    'builder': [
-      'Android32 Tests (L Nexus7.2)',
-    ],
-    'hostname': 'build22-b3',
-  },
-  {
-    'master': 'WebRTC',
-    'os': 'linux',
-    'version': 'trusty',
-    'bits': '64',
-    'builder': [
-      'Android32 Tests (L Nexus7.2)(dbg)',
-    ],
-    'hostname': 'build21-b3',
-  },
-  {
-    'master': 'WebRTC',
-    'os': 'linux',
-    'version': 'trusty',
-    'bits': '64',
-    'builder': [
-      'Android64 Tests (L Nexus9)',
-    ],
-    'hostname': 'build17-b3',
-  },
-] + [
   # Mac.
   {
     'master': 'WebRTC',