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

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

 # Copyright 2016 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 from buildbot.schedulers.basic import SingleBranchScheduler
 
 # These modules come from scripts/master, which must be in the PYTHONPATH.
 from master import master_utils
 from master import slaves_list
 from master.factory import remote_run_factory
@@ skipping 22 matching lines @@
                           builderNames=[
         'Android32 Builder',
         'Android64 Builder',
         'Linux Trusty',
         'Mac 10.11',
         'Win7',
     ]),
 ])
 
 specs = [
-  {'name': 'Android32 Builder', 'slavebuilddir': 'android_32'},
-  {'name': 'Android64 Builder', 'slavebuilddir': 'android_64'},
-  {'name': 'Android32 Tests (M Nexus5X)'},
-  {'name': 'Android64 Tests (M Nexus9)'},
+  {'name': 'Android32 Builder'},
+  {'name': 'Android64 Builder'},
+  {'name': 'Android32 Tests (L Nexus5)'},
+  {'name': 'Android32 Tests (L Nexus7.2)'},
+  {'name': 'Android64 Tests (L Nexus9)'},
   {'name': 'Linux Trusty'},
   {'name': 'Mac 10.11'},
   {'name': 'Win7'},
 ]
 
 
 def m_remote_run(recipe, **kwargs):
   return remote_run_factory.RemoteRunFactory(
       active_master=ActiveMaster,
       repository='https://chromium.googlesource.com/chromium/tools/build.git',
@@ skipping 54 matching lines @@
       lookup=lookup,
       mode='problem',
       relayhost=config.Master.smtp))
 
 # Do it at the end to override values set by AutoSetupMaster, the default is
 # too low. Must keep at least a few days worth of builds.
 c['buildHorizon'] = 3000
 c['logHorizon'] = 3000
 # Must be at least 2x the number of slaves.
 c['eventHorizon'] = 200