apk-based test runner work. Not enabled yet. This CL is a combination of upstreaming, ndk/ant-ifi…

build/android/single_test_runner.py

Index: build/android/single_test_runner.py
diff --git a/build/android/single_test_runner.py b/build/android/single_test_runner.py
index ef9971a30a18351571b7eb88a2329799d92823c7..4a93813b47efb97626fe06a87884f230e29f82b4 100644
--- a/build/android/single_test_runner.py
+++ b/build/android/single_test_runner.py
@@ -9,6 +9,7 @@ import sys
 from base_test_runner import BaseTestRunner
 import debug_info
 import run_tests_helper
+from test_package_apk import TestPackageApk
 from test_package_executable import TestPackageExecutable
 from test_result import TestResults
 
@@ -46,7 +47,15 @@ class SingleTestRunner(BaseTestRunner):
       self.dump_debug_info = None
     self.fast_and_loose = fast_and_loose
 
-    self.test_package = TestPackageExecutable(self.adb, device,
+    if os.path.splitext(test_suite)[1] == '.apk':
+      self.test_package = TestPackageApk(self.adb, device,
+          test_suite, timeout, rebaseline, performance_test, cleanup_test_files,
+          tool, self.dump_debug_info)
+    else:
+      android_product_out = '.' # os.environ['ANDROID_PRODUCT_OUT']
+      symbols_dir = os.path.join(android_product_out, 'symbols', 'data',
+                                 'local')
+      self.test_package = TestPackageExecutable(self.adb, device,
         test_suite, timeout, rebaseline, performance_test, cleanup_test_files,
         tool, self.dump_debug_info)