Revert of [Android] Remove more uses of android_commands from build/android/pylib.

build/android/pylib/device/battery_utils_test.py

Index: build/android/pylib/device/battery_utils_test.py
diff --git a/build/android/pylib/device/battery_utils_test.py b/build/android/pylib/device/battery_utils_test.py
index 434b9d8bbf18ef28aa67b854abfba5f977405b70..15b4c3441c9351a67b5ef8d91459c3a2a7ed2e39 100755
--- a/build/android/pylib/device/battery_utils_test.py
+++ b/build/android/pylib/device/battery_utils_test.py
@@ -14,6 +14,7 @@
 import sys
 import unittest
 
+from pylib import android_commands
 from pylib import constants
 from pylib.device import battery_utils
 from pylib.device import device_errors
@@ -61,7 +62,8 @@
 
   def testInitWithDeviceUtil(self):
     serial = '0fedcba987654321'
-    d = device_utils.DeviceUtils(serial)
+    a = android_commands.AndroidCommands(device=serial)
+    d = device_utils.DeviceUtils(a)
     b = battery_utils.BatteryUtils(d)
     self.assertEqual(d, b._device)