[Android] Enable running uiautomator tests.

build/android/pylib/host_driven/python_test_base.py

Index: build/android/pylib/host_driven/python_test_base.py
diff --git a/build/android/pylib/host_driven/python_test_base.py b/build/android/pylib/host_driven/python_test_base.py
index 6d9f53107fec27c0a991a36934a8e8f2c880adaa..390d028cd96e26308800690b7471f6d96c9d90a0 100644
--- a/build/android/pylib/host_driven/python_test_base.py
+++ b/build/android/pylib/host_driven/python_test_base.py
@@ -25,7 +25,7 @@ import time
 
 from pylib import android_commands
 from pylib.base.test_result import SingleTestResult, TestResults
-from pylib.instrumentation import apk_info
+from pylib.instrumentation import test_package
 from pylib.instrumentation import test_runner
 
 
@@ -75,10 +75,11 @@ class PythonTestBase(object):
       TestResults object with a single test result.
     """
     test = self._ComposeFullTestName(fname, suite, test)
-    apks = [apk_info.ApkInfo(self.options.test_apk_path,
-            self.options.test_apk_jar_path)]
+    test_pkg = test_package.TestPackage(
+        self.options.test_apk_path, self.options.test_apk_jar_path)
     java_test_runner = test_runner.TestRunner(self.options, self.device_id,
-                                              self.shard_index, False, apks,
+                                              self.shard_index, False,
+                                              test_pkg,
                                               self.ports_to_forward)
     try:
       java_test_runner.SetUp()