Reland of Make instrumentation_test_apk depend on their apk_under_test.

build/config/android/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("//base/android/linker/config.gni")
 import("//build/config/android/config.gni")
 import("//build/config/android/internal_rules.gni")
 import("//build/config/sanitizers/sanitizers.gni")
 import("//build/toolchain/toolchain.gni")
 import("//third_party/android_platform/config.gni")
@@ skipping 1507 matching lines @@
       java_files = []
     }
     srcjar_deps = _srcjar_deps
     jar_path = _jar_path
     dex_path = _lib_dex_path
     emma_never_instrument = _emma_never_instrument
 
     if (defined(invoker.deps)) {
       deps += invoker.deps
     }
+    if (defined(invoker.apk_under_test)) {
+      deps += [ "${invoker.apk_under_test}__java" ]
+    }
   }
 
   # TODO(cjhopman): This is only ever needed to calculate the list of tests to
   # run. See build/android/pylib/instrumentation/test_jar.py. We should be
   # able to just do that calculation at build time instead.
   if (defined(invoker.create_dist_ijar) && invoker.create_dist_ijar) {
     _dist_ijar_path = "$root_build_dir/test.lib.java/" +
                       get_path_info(_final_apk_path, "name") + ".jar"
     action("${_template_name}_dist_ijar") {
       script = "//build/android/gyp/create_dist_jar.py"
@@ skipping 427 matching lines @@
         (defined(invoker.java_files) || defined(invoker.DEPRECATED_java_in_dir))
   }
 
   group(target_name) {
     public_deps = [
       ":$_apk_target_name",
       ":$_test_runner_target_name",
 
       # Required by test runner to enumerate test list.
       ":${_apk_target_name}_dist_ijar",
+      invoker.apk_under_test,
     ]
   }
 }
 
 # Declare an Android gtest apk
 #
 # This target creates an Android apk for running gtest-based unittests.
 #
 # Variables
 #   deps: Specifies the dependencies of this target. These will be passed to
@@ skipping 299 matching lines @@
   }
 
   android_library(target_name) {
     java_files = []
     srcjar_deps = [ ":${_template_name}__protoc_java" ]
     deps = [
       "//third_party/android_protobuf:protobuf_nano_javalib",
     ]
   }
 }