[Android] Make generated test scripts pass apk paths.

build/android/test_runner.gypi

 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Generates a script in the output bin directory which runs the test
 # target using the test runner script in build/android/pylib/test_runner.py.
 #
 # To use this, include this file in a gtest or instrumentation test target.
 # {
 #   'target_name': 'gtest',
@@ skipping 23 matching lines @@
     'variables': {
       'isolate_file%': '',
     },
     'test_runner_args': ['--output-directory', '<(PRODUCT_DIR)'],
     'conditions': [
       ['test_type == "gtest"', {
         'test_runner_args': ['--suite', '<(test_suite_name)'],
         '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 != ""', {
         'test_runner_args': ['--isolate-file-path', '<(isolate_file)']
       }],
     ],
   },
   'actions': [
     {
       'action_name': 'create_test_runner_script_<(script_name)',
       'message': 'Creating test runner script <(script_name)',
       'variables': {
         'script_output_path': '<(PRODUCT_DIR)/bin/<(script_name)',
       },
       'inputs': [
         '<(DEPTH)/build/android/gyp/create_test_runner_script.py',
       ],
       'outputs': [
         '<(script_output_path)'
       ],
       'action': [
         'python', '<(DEPTH)/build/android/gyp/create_test_runner_script.py',
         '--script-output-path=<(script_output_path)',
         '<(test_type)', '<@(test_runner_args)',
       ],
     },
   ],
-}
+}