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

build/android/pylib/device/battery_utils_test.py

 #!/usr/bin/env python
 # Copyright 2014 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.
 
 """
 Unit tests for the contents of battery_utils.py
 """
 
 # pylint: disable=W0613
 
 import logging
 import os
 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
 from pylib.device import device_utils
 from pylib.device import device_utils_test
 from pylib.utils import mock_calls
 
 # RunCommand from third_party/android_testrunner/run_command.py is mocked
 # below, so its path needs to be in sys.path.
 sys.path.append(os.path.join(
@@ skipping 27 matching lines @@
         self.adb, default_timeout=10, default_retries=0)
     self.watchMethodCalls(self.call.adb, ignore=['GetDeviceSerial'])
     self.battery = battery_utils.BatteryUtils(
         self.device, default_timeout=10, default_retries=0)
 
 
 class BatteryUtilsInitTest(unittest.TestCase):
 
   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)
 
   def testInitWithMissing_fails(self):
     with self.assertRaises(TypeError):
       battery_utils.BatteryUtils(None)
     with self.assertRaises(TypeError):
       battery_utils.BatteryUtils('')
 
 
@@ skipping 230 matching lines @@
             _DUMPSYS_OUTPUT),
         (self.call.device.ReadFile('/proc/uid_stat/1000/tcp_snd'), 1),
         (self.call.device.ReadFile('/proc/uid_stat/1000/tcp_rcv'), 2)):
       self.battery._cache.clear()
       self.assertEqual(self.battery.GetNetworkData('test_package1'), (1,2))
 
 
 if __name__ == '__main__':
   logging.getLogger().setLevel(logging.DEBUG)
   unittest.main(verbosity=2)