[Android] Make generated test scripts pass apk paths.

build/android/test_runner.gypi

Index: build/android/test_runner.gypi
diff --git a/build/android/test_runner.gypi b/build/android/test_runner.gypi
index 92f355bf1fb4abe73d3480f728ac5f7ecfd7665b..f5718882830504117ced3b8743ad35d907222d17 100644
--- a/build/android/test_runner.gypi
+++ b/build/android/test_runner.gypi
@@ -41,7 +41,10 @@
         'script_name': 'run_<(test_suite_name)',
       }],
       ['test_type == "instrumentation"', {
-        'test_runner_args': ['--test-apk', '<(apk_name)'],
+        'test_runner_args': [
+          '--apk-under-test', '>(tested_apk_path)',
+          '--test-apk', '>(final_apk_path)',
+        ],
         'script_name': 'run_<(_target_name)',
       }],
       ['isolate_file != ""', {
@@ -69,4 +72,4 @@
       ],
     },
   ],
-}
+}