Seperate apk_info and jar_info.

build/android/pylib/run_python_tests.py

Index: build/android/pylib/run_python_tests.py
diff --git a/build/android/pylib/run_python_tests.py b/build/android/pylib/run_python_tests.py
index 7d39f482958003aa30571783eee7a39e0107c820..eebfcd63f28549ceb2015dd9c5c181bea21b466a 100644
--- a/build/android/pylib/run_python_tests.py
+++ b/build/android/pylib/run_python_tests.py
@@ -10,7 +10,6 @@ import sys
 import types
 
 import android_commands
-import apk_info
 import constants
 import python_test_base
 from python_test_caller import CallPythonTest
@@ -19,6 +18,7 @@ import run_java_tests
 from run_java_tests import FatalTestException
 from test_info_collection import TestInfoCollection
 from test_result import TestResults
+from utils import apk_and_jar_info
 
 
 def _GetPythonFiles(root, files):
@@ -84,7 +84,8 @@ def DispatchPythonTests(options):
   # Copy files to each device before running any tests.
   for device_id in attached_devices:
     logging.debug('Pushing files to device %s', device_id)
-    apks = [apk_info.ApkInfo(options.test_apk_path, options.test_apk_jar_path)]
+    apks = [apk_and_jar_info.ApkAndJarInfo(options.test_apk_path,
+                                           options.test_apk_jar_path)]
     test_files_copier = run_java_tests.TestRunner(options, device_id,
                                                   None, False, 0, apks, [])
     test_files_copier.CopyTestFilesOnce()