Revert of [Android] Remove android_commands and android_testrunner.

build/android/provision_devices.py

Index: build/android/provision_devices.py
diff --git a/build/android/provision_devices.py b/build/android/provision_devices.py
index cde01ad0cf0167c72125f96f3fcb4c658c63ab5e..427d1fa91d5330c04bed68c1a79712a68dbf0e07 100755
--- a/build/android/provision_devices.py
+++ b/build/android/provision_devices.py
@@ -28,6 +28,11 @@
 from pylib.device import device_utils
 from pylib.utils import run_tests_helper
 from pylib.utils import timeout_retry
+
+sys.path.append(os.path.join(constants.DIR_SOURCE_ROOT,
+                             'third_party', 'android_testrunner'))
+import errors
+
 
 _SYSTEM_WEBVIEW_PATHS = ['/system/app/webview', '/system/app/WebViewGoogle']
 
@@ -101,7 +106,8 @@
     if should_run_phase(_PHASES.FINISH):
       run_phase(FinishProvisioning, reboot=False)
 
-  except device_errors.CommandTimeoutError:
+  except (errors.WaitForResponseTimedOutError,
+          device_errors.CommandTimeoutError):
     logging.exception('Timed out waiting for device %s. Adding to blacklist.',
                       str(device))
     device_blacklist.ExtendBlacklist([str(device)])