[Android] Enable running uiautomator tests.

build/android/adb_install_apk.py

Index: build/android/adb_install_apk.py
diff --git a/build/android/adb_install_apk.py b/build/android/adb_install_apk.py
index 8728c089931028c6f19b50d27bbcaf9ce7966746..ad694571e6b2fcfb43e46915e2424f842b77a129 100755
--- a/build/android/adb_install_apk.py
+++ b/build/android/adb_install_apk.py
@@ -11,7 +11,7 @@ import sys
 
 from pylib import android_commands
 from pylib import constants
-from pylib.instrumentation import apk_info
+from pylib.utils import apk_helper
 from pylib.utils import test_options_parser
 
 
@@ -36,7 +36,7 @@ def main(argv):
     raise Exception('Error: no connected devices')
 
   if not options.apk_package:
-    options.apk_package = apk_info.GetPackageNameForApk(options.apk)
+    options.apk_package = apk_helper.GetPackageName(options.apk)
 
   pool = multiprocessing.Pool(len(devices))
   # Send a tuple (apk_path, apk_package, device) per device.