Reland of Make instrumentation_test_apk depend on their apk_under_test.

build/config/android/rules.gni

Index: build/config/android/rules.gni
diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
index 669f64606f0bd8ffdcc47b6d929b00ba3ed00b39..24331e285948650f768c393e39acff929aa333a7 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -1525,6 +1525,9 @@ template("android_apk") {
     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
@@ -1972,6 +1975,7 @@ template("instrumentation_test_apk") {
 
       # Required by test runner to enumerate test list.
       ":${_apk_target_name}_dist_ijar",
+      invoker.apk_under_test,
     ]
   }
 }