[android] Tweak data deps to include two chromium tool binaries. (RELAND)

This includes:
 - //tools/android/md5sum:md5sum_bin($host_toolchain) -- we had previously
    only depended on the symlink, not the target thereof
 - //build/android/pylib/device/commands -- we previously only had it set
    as a dependency of the forwarder & incremental APKs

This should prevent bots running chromium tests from downloading the devil
versions stored in GS.

BUG=664211,664423

Review-Url: https://codereview.chromium.org/2485383006
Cr-Original-Commit-Position: refs/heads/master@{#431611}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 302e4da2da2463a360e26beb8cb88766c48ab6db

android/pylib/device/commands/BUILD.gn

@@ -6,11 +6,14 @@ import("//build/config/android/rules.gni")
 
 group("commands") {
   data_deps = [
-    ":chromium_commands",
+    ":chromium_commands_java",
   ]
 }
 
-android_library("chromium_commands") {
+android_library("chromium_commands_java") {
   java_files = [ "java/src/org/chromium/android/commands/unzip/Unzip.java" ]
   dex_path = "$root_build_dir/lib.java/chromium_commands.dex.jar"
+  data = [
+    dex_path,
+  ]
 }

config/android/internal_rules.gni

@@ -31,7 +31,6 @@ _java_target_whitelist = [
 
   # TODO(agrieve): Rename targets below to match above patterns.
   "*android_webview/glue:glue",
-  "//build/android/pylib/device/commands:chromium_commands",
   "//build/android/rezip:rezip",
   "//chrome/test/android/cast_emulator:cast_emulator",
   "//mojo/public/java:bindings",

config/android/rules.gni

@@ -2314,7 +2314,7 @@ if (enable_java_templates) {
       install_script_name = _install_script_name
       deps += [ "//testing/android/broker:broker_java" ]
       data_deps += [
-        "//testing/android/driver:driver_apk",
+        "//build/android/pylib/device/commands",
         "//tools/android/forwarder2",
         "//tools/android/md5sum",
       ]
@@ -2446,7 +2446,10 @@ if (enable_java_templates) {
         "//testing/android/appurify_support:appurify_support_java",
         "//testing/android/reporter:reporter_java",
       ]
-      data_deps += [ "//tools/android/md5sum" ]
+      data_deps += [
+        "//build/android/pylib/device/commands",
+        "//tools/android/md5sum",
+      ]
       if (host_os == "linux") {
         data_deps += [ "//tools/android/forwarder2" ]
       }

symlink.gni

@@ -10,6 +10,7 @@ template("symlink") {
   action(target_name) {
     forward_variables_from(invoker,
                            [
+                             "data_deps",
                              "deps",
                              "testonly",
                              "visibility",
@@ -60,6 +61,12 @@ template("binary_symlink") {
     deps = [
       invoker.binary_label,
     ]
+    data_deps = [
+      invoker.binary_label,
+    ]
+    if (defined(invoker.data_deps)) {
+      data_deps += invoker.data_deps
+    }
 
     _out_dir = get_label_info(invoker.binary_label, "root_out_dir")
     if (defined(invoker.binary_output_name)) {