Update from https://crrev.com/307758

build/android/pylib/device/device_utils.py

Index: build/android/pylib/device/device_utils.py
diff --git a/build/android/pylib/device/device_utils.py b/build/android/pylib/device/device_utils.py
index 553e9602ffc0a9ebfba319bea746fc460e86b605..1624cccb7596f03d990373e894c233b8576674c6 100644
--- a/build/android/pylib/device/device_utils.py
+++ b/build/android/pylib/device/device_utils.py
@@ -918,7 +918,7 @@ class DeviceUtils(object):
         host_temp.write(contents)
         host_temp.flush()
         if as_root and self.NeedsSU():
-          with device_temp_file.DeviceTempFile(self) as device_temp:
+          with device_temp_file.DeviceTempFile(self.adb) as device_temp:
             self.adb.Push(host_temp.name, device_temp.name)
             # Here we need 'cp' rather than 'mv' because the temp and
             # destination files might be on different file systems (e.g.
@@ -1173,8 +1173,8 @@ class DeviceUtils(object):
     """Returns the device serial."""
     return self.adb.GetDeviceSerial()
 
-  @staticmethod
-  def parallel(devices=None, async=False):
+  @classmethod
+  def parallel(cls, devices=None, async=False):
     """Creates a Parallelizer to operate over the provided list of devices.
 
     If |devices| is either |None| or an empty list, the Parallelizer will
@@ -1190,10 +1190,10 @@ class DeviceUtils(object):
     Returns:
       A Parallelizer operating over |devices|.
     """
-    if not devices or len(devices) == 0:
-      devices = pylib.android_commands.GetAttachedDevices()
-    parallelizer_type = (parallelizer.Parallelizer if async
-                         else parallelizer.SyncParallelizer)
-    return parallelizer_type([
-        d if isinstance(d, DeviceUtils) else DeviceUtils(d)
-        for d in devices])
+    if not devices:
+      devices = adb_wrapper.AdbWrapper.GetDevices()
+    devices = [d if isinstance(d, cls) else cls(d) for d in devices]
+    if async:
+      return parallelizer.Parallelizer(devices)
+    else:
+      return parallelizer.SyncParallelizer(devices)