Update from https://crrev.com/328418

build/android/pylib/perf/perf_control_unittest.py

Index: build/android/pylib/perf/perf_control_unittest.py
diff --git a/build/android/pylib/perf/perf_control_unittest.py b/build/android/pylib/perf/perf_control_unittest.py
index dd7cb88002cbd73c2ead71bcfa9a16383231f1c0..69b8b469bfcdd0511e8840dd76fe0e6f1fcfca5f 100644
--- a/build/android/pylib/perf/perf_control_unittest.py
+++ b/build/android/pylib/perf/perf_control_unittest.py
@@ -9,7 +9,6 @@ import unittest
 
 sys.path.append(os.path.join(os.path.dirname(__file__), os.pardir, os.pardir))
 
-from pylib import android_commands
 from pylib.device import device_utils
 from pylib.perf import perf_control
 
@@ -18,10 +17,9 @@ class TestPerfControl(unittest.TestCase):
     if not os.getenv('BUILDTYPE'):
       os.environ['BUILDTYPE'] = 'Debug'
 
-    devices = android_commands.GetAttachedDevices()
+    devices = device_utils.DeviceUtils.HealthyDevices()
     self.assertGreater(len(devices), 0, 'No device attached!')
-    self._device = device_utils.DeviceUtils(
-        android_commands.AndroidCommands(device=devices[0]))
+    self._device = devices[0]
 
   def testHighPerfMode(self):
     perf = perf_control.PerfControl(self._device)