[Android] Separate concepts of pushing test data and installing test apk.

build/android/pylib/instrumentation/test_runner.py

Index: build/android/pylib/instrumentation/test_runner.py
diff --git a/build/android/pylib/instrumentation/test_runner.py b/build/android/pylib/instrumentation/test_runner.py
index c1343260c772cb669c1b4a147f7156e54aa101f6..4e8578d2294e34170c9ae30ff2fe62702c035807 100644
--- a/build/android/pylib/instrumentation/test_runner.py
+++ b/build/android/pylib/instrumentation/test_runner.py
@@ -89,7 +89,12 @@ class TestRunner(base_test_runner.BaseTestRunner):
     self.forwarder = None
 
   #override
-  def PushDependencies(self):
+  def InstallTestPackage(self):
+    if self.install_apk:
+      self.test_pkg.Install(self.adb)
+
+  #override
+  def PushDataDeps(self):
     # TODO(frankf): Implement a general approach for copying/installing
     # once across test runners.
     if TestRunner._DEVICE_HAS_TEST_FILES.get(self.device, False):
@@ -115,8 +120,6 @@ class TestRunner(base_test_runner.BaseTestRunner):
         self.adb.PushIfNeeded(host_test_files_path,
                               self.adb.GetExternalStorage() + '/' +
                               TestRunner._DEVICE_DATA_DIR + '/' + dst_layer)
-    if self.install_apk:
-      self.test_pkg.Install(self.adb)
     self.tool.CopyFiles()
     TestRunner._DEVICE_HAS_TEST_FILES[self.device] = True