Seperate apk_info and jar_info.

build/android/run_instrumentation_tests.py

Index: build/android/run_instrumentation_tests.py
diff --git a/build/android/run_instrumentation_tests.py b/build/android/run_instrumentation_tests.py
index f484dac9d5759b67fc15b18f7f529f818b759f5a..1a686265256d33cb6a03b6d392a0eed5ebf466dc 100755
--- a/build/android/run_instrumentation_tests.py
+++ b/build/android/run_instrumentation_tests.py
@@ -11,7 +11,6 @@ import os
 import sys
 import time
 
-from pylib import apk_info
 from pylib import buildbot_report
 from pylib import constants
 from pylib import ports
@@ -20,6 +19,7 @@ from pylib import run_python_tests
 from pylib import run_tests_helper
 from pylib import test_options_parser
 from pylib.test_result import TestResults
+from pylib.utils import apk_and_jar_info
 
 
 def DispatchInstrumentationTests(options):
@@ -49,7 +49,8 @@ def DispatchInstrumentationTests(options):
   if options.run_java_tests:
     java_results = run_java_tests.DispatchJavaTests(
         options,
-        [apk_info.ApkInfo(options.test_apk_path, options.test_apk_jar_path)])
+        [apk_and_jar_info.ApkAndJarInfo(options.test_apk_path,
+                                        options.test_apk_jar_path)])
   if options.run_python_tests:
     python_results = run_python_tests.DispatchPythonTests(options)