Put generated non-test Java runner scripts into bin/

build/config/android/internal_rules.gni

Index: build/config/android/internal_rules.gni
diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni
index 952f78aa3f18f32da80cd31ef2fc79c219702e78..9b936e0bef25c953baaa99dbd2b03bbd6fc36178 100644
--- a/build/config/android/internal_rules.gni
+++ b/build/config/android/internal_rules.gni
@@ -194,11 +194,16 @@ template("java_binary_script") {
   _build_config = invoker.build_config
   _jar_path = invoker.jar_path
   _script_name = invoker.script_name
+  _used_only_by_tests =
+      defined(invoker.used_only_by_tests) && invoker.used_only_by_tests
 
   action(target_name) {
     script = "//build/android/gyp/create_java_binary_script.py"
     depfile = "$target_gen_dir/$_script_name.d"
-    java_script = "$root_build_dir/bin/helper/$_script_name"
+    java_script = "$root_build_dir/bin/$_script_name"
+    if (_used_only_by_tests) {
+      java_script = "$root_build_dir/bin/helper/$_script_name"
+    }
     inputs = [
       _build_config,
     ]
@@ -1298,6 +1303,7 @@ template("java_prebuilt_impl") {
                              [
                                "bootclasspath",
                                "main_class",
+                               "used_only_by_tests",
                                "wrapper_script_args",
                              ])
       build_config = _build_config
@@ -1698,6 +1704,7 @@ template("java_library_impl") {
                              [
                                "bootclasspath",
                                "main_class",
+                               "used_only_by_tests",
                                "wrapper_script_args",
                              ])
       build_config = _build_config