Reland "Allow multiple devices on bisects hosts "

scripts/slave/recipe_modules/chromium_android/api.py

Index: scripts/slave/recipe_modules/chromium_android/api.py
diff --git a/scripts/slave/recipe_modules/chromium_android/api.py b/scripts/slave/recipe_modules/chromium_android/api.py
index 09a2df0f45f2e426215400abab0debb5457a0aaf..3d306fe1d22a7469edae08be8f505ce5bcf9a74e 100644
--- a/scripts/slave/recipe_modules/chromium_android/api.py
+++ b/scripts/slave/recipe_modules/chromium_android/api.py
@@ -22,6 +22,7 @@ class AndroidApi(recipe_api.RecipeApi):
     super(AndroidApi, self).__init__(**kwargs)
     self._devices = None
     self._file_changes_path = None
+    self._multiple_device_test = False
 
   def get_config_defaults(self):
     return {
@@ -30,6 +31,14 @@ class AndroidApi(recipe_api.RecipeApi):
     }
 
   @property
+  def multiple_device_test(self):
+    return self._multiple_device_test
+
+  @multiple_device_test.setter
+  def multiple_device_test(self, value):
+    self._multiple_device_test = value
+
+  @property
   def devices(self):
     assert self._devices is not None,\
         'devices is only available after device_status()'
@@ -386,7 +395,7 @@ class AndroidApi(recipe_api.RecipeApi):
         infra_step=True,
         **kwargs)
 
-  def device_status(self, **kwargs):
+  def device_status(self,  **kwargs):
     buildbot_file = '/home/chrome-bot/.adb_device_info'
     args = [
         '--json-output', self.m.json.output(),
@@ -397,8 +406,11 @@ class AndroidApi(recipe_api.RecipeApi):
         '-v', '--overwrite-known-devices-files',
     ]
     try:
+      device_step_name = 'device_status'
+      if self.multiple_device_test:
+        device_step_name = 'multiple_device_status'
       result = self.m.step(
-          'device_status',
+          device_step_name,
           [self.m.path['checkout'].join('third_party', 'catapult', 'devil',
                                         'devil', 'android', 'tools',
                                         'device_status.py')] + args,