Reland of Make instrumentation_test_apk depend on their apk_under_test.

build/config/android/internal_rules.gni

 # Copyright 2014 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.
 
 import("//build/config/android/config.gni")
 import("//build/config/sanitizers/sanitizers.gni")
 import("//build/config/zip.gni")
 import("//third_party/ijar/ijar.gni")
 
 assert(is_android)
@@ skipping 423 matching lines @@
     }
     if (requires_android) {
       args += [ "--requires-android" ]
     }
     if (defined(invoker.bypass_platform_checks) &&
         invoker.bypass_platform_checks) {
       args += [ "--bypass-platform-checks" ]
     }
 
     if (defined(invoker.apk_under_test)) {
-      deps += [ invoker.apk_under_test ]
+      deps += [ "${invoker.apk_under_test}__build_config" ]
       apk_under_test_gen_dir =
           get_label_info(invoker.apk_under_test, "target_gen_dir")
       apk_under_test_name = get_label_info(invoker.apk_under_test, "name")
       apk_under_test_config =
           "$apk_under_test_gen_dir/$apk_under_test_name.build_config"
       args += [
         "--tested-apk-config",
         rebase_path(apk_under_test_config, root_build_dir),
       ]
     }
@@ skipping 1688 matching lines @@
     ]
     args = [
       "--depfile",
       rebase_path(depfile, root_build_dir),
       "--script-output-path",
       rebase_path(generated_script, root_build_dir),
     ]
     args += test_runner_args
   }
 }