Seperate apk_info and jar_info.

build/android/pylib/python_test_base.py

Index: build/android/pylib/python_test_base.py
diff --git a/build/android/pylib/python_test_base.py b/build/android/pylib/python_test_base.py
index d2cdfb09321051549eb1662c42f00bd8f796c9c2..1b7f76cc97f821d4b055816ce39c7036ffe8705d 100644
--- a/build/android/pylib/python_test_base.py
+++ b/build/android/pylib/python_test_base.py
@@ -24,9 +24,9 @@ import os
 import time
 
 import android_commands
-import apk_info
 from run_java_tests import TestRunner
 from test_result import SingleTestResult, TestResults
+from utils import apk_and_jar_info
 
 
 # aka the parent of com.google.android
@@ -75,8 +75,8 @@ 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)]
+    apks = [apk_and_jar_info.ApkAndJarInfo(self.options.test_apk_path,
+                                           self.options.test_apk_jar_path)]
     java_test_runner = TestRunner(self.options, self.device_id, [test], False,
                                   self.shard_index,
                                   apks,