Reland "Allow multiple devices on bisects hosts "

scripts/slave/recipe_modules/bisect_tester/perf_test.py

 # Copyright 2015 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.
 
 import os
 import re
 import time
 
 from . import parse_metric
 
@@ skipping 73 matching lines @@
   metric = test_config.get('metric')
   retcodes = []
   output_for_all_runs = []
   temp_dir = None
   repeat_cnt = test_config['repeat_count']
 
   command = test_config['command']
   use_chartjson = bool('chartjson' in command)
   is_telemetry = _is_telemetry_command(command)
   start_time = time.time()
+
+  if api.m.chromium.c.TARGET_PLATFORM == 'android' and is_telemetry:
+    device_serial_number = api.device_to_test;
+    if device_serial_number:
+      command += ' --device ' + device_serial_number # pragma: no cover
+
   for i in range(repeat_cnt):
     elapsed_minutes = (time.time() - start_time) / 60.0
     # A limit of 0 means 'no timeout set'.
     if limit and elapsed_minutes >= limit:  # pragma: no cover
       break
     if is_telemetry:
       if i == 0 and kwargs.get('reset_on_first_run'):
         command += ' --reset-results'
       if i == repeat_cnt - 1 and kwargs.get('upload_on_last_run'):
         command += ' --upload-results'
@@ skipping 131 matching lines @@
     step_result.presentation.logs['Captured Output'] = (
         step_result.stdout or '').splitlines()
   except api.m.step.StepFailure as sf:
     sf.result.presentation.logs['Failure Output'] = (
         sf.result.stdout or '').splitlines()
     if sf.result.stderr:  # pragma: no cover
       sf.result.presentation.logs['stderr'] = (
         sf.result.stderr).splitlines()
     return sf.result.stdout, sf.result.stderr, sf.result.retcode
   return step_result.stdout, step_result.stderr, step_result.retcode