Convert mojo_test_apk android_apk->instrumentation_test_apk

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 d72242c1225605a2b64775a2f8ccdd7e22281348..6ebbb409a25054374429f379245157cff6c04548 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -1999,16 +1999,20 @@ template("instrumentation_test_apk") {
 
       # Required by test runner to enumerate test list.
       ":${_apk_target_name}_dist_ijar",
-      invoker.apk_under_test,
     ]
+    if (defined(invoker.apk_under_test)) {
+      public_deps += [ invoker.apk_under_test ]
+    }
   }
   group("${target_name}_incremental") {
     public_deps = [
       ":${_apk_target_name}_dist_ijar",
       ":${_apk_target_name}_incremental",
       ":${_test_runner_target_name}_incremental",
-      "${invoker.apk_under_test}_incremental",
     ]
+    if (defined(invoker.apk_under_test)) {
+      public_deps += [ "${invoker.apk_under_test}_incremental" ]
+    }
   }
 }