[Android] Refactor browser test execution. (RELAND)

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")
 
 assert(is_android)
 
 rebased_android_sdk = rebase_path(android_sdk, root_build_dir)
 rebased_android_sdk_root = rebase_path(android_sdk_root, root_build_dir)
@@ skipping 68 matching lines @@
   build_config = invoker.build_config
 
   action(target_name) {
     script = "//build/android/findbugs_diff.py"
     depfile = "$target_gen_dir/$target_name.d"
     result_path = "$target_gen_dir/$target_name/result.xml"
     exclusions_file = "//build/android/findbugs_filter/findbugs_exclude.xml"
 
     rebased_build_config = rebase_path(build_config, root_build_dir)
 
+    if (defined(invoker.deps)) {
+      deps = invoker.deps
+    }
+
+    if (defined(invoker.testonly)) {
+      testonly = invoker.testonly
+    }
+
     inputs = [
       "//build/android/pylib/utils/findbugs.py",
       exclusions_file,
       jar_path,
     ]
 
     outputs = [
       depfile,
       result_path,
     ]
@@ skipping 1403 matching lines @@
     ]
     args = [
       "--depfile",
       rebase_path(depfile, root_build_dir),
       "--script-output-path",
       rebase_path(generated_script, root_build_dir),
     ]
     args += test_runner_args
   }
 }