Revert of [Android] Remove android_commands and android_testrunner.

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 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(
+    constants.DIR_SOURCE_ROOT, 'third_party', 'android_testrunner'))
+
 sys.path.append(os.path.join(
     constants.DIR_SOURCE_ROOT, 'third_party', 'pymock'))
 import mock # pylint: disable=F0401
 
 _DUMPSYS_OUTPUT = [
     '9,0,i,uid,1000,test_package1',
     '9,0,i,uid,1001,test_package2',
     '9,1000,l,pwi,uid,1',
     '9,1001,l,pwi,uid,2'
 ]
@@ skipping 531 matching lines @@
             ['9,1000,l,pwi,uid,0.0327']),
         (self.call.device.RunShellCommand(
             ['dumpsys', 'battery', 'reset'], check_return=True), [])):
       with self.assertRaises(device_errors.CommandFailedError):
         self.battery._ClearPowerData()
 
 
 if __name__ == '__main__':
   logging.getLogger().setLevel(logging.DEBUG)
   unittest.main(verbosity=2)