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

build/config/android/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.
 
 # Do not add any imports to non-//build directories here.
 # Some projects (e.g. V8) do not have non-build directories DEPS'ed in.
 import("//build/config/android/config.gni")
 import("//build/config/android/internal_rules.gni")
 import("//build/config/compiler/compiler.gni")
 import("//build/config/dcheck_always_on.gni")
@@ skipping 2296 matching lines @@
       ]
     }
 
     android_apk(_apk_target_name) {
       deps = []
       data_deps = []
       forward_variables_from(invoker, "*")
       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",
       ]
       if (defined(invoker.additional_apks)) {
         data_deps += invoker.additional_apks
       }
 
       if (defined(invoker.proguard_enabled) && invoker.proguard_enabled) {
         # When ProGuard is on, we use ProGuard to combine the under test java
         # code and the test java code. This is to allow us to apply all ProGuard
@@ skipping 111 matching lines @@
 
       if (!defined(use_default_launcher) || use_default_launcher) {
         deps += [ "//testing/android/native_test:native_test_java" ]
       }
       shared_libraries = [ invoker.shared_library ]
       deps += [
         "//base:base_java",
         "//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" ]
       }
     }
   }
 
   # Generate .java files from .aidl files.
   #
   # This target will store the .java files in a srcjar and should be included in
   # an android_library or android_apk's srcjar_deps.
@@ skipping 308 matching lines @@
         # because in practice they seem to contain classes required to be in the
         # classpath.
         deps += _subjar_targets
       }
       if (defined(_res_target_name)) {
         deps += [ ":$_res_target_name" ]
       }
     }
   }
 }