Build chromium_commands when building any _incremental apk

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.
 
 import("//base/android/linker/config.gni")
 import("//build/config/android/config.gni")
 import("//build/config/android/internal_rules.gni")
 import("//build/toolchain/toolchain.gni")
 import("//third_party/android_platform/config.gni")
 import("//tools/grit/grit_rule.gni")
@@ skipping 1601 matching lines @@
     if (_create_language_splits) {
       args += [ "--split=${_rebased_apk_path_no_ext}-language-*.apk" ]
     }
   }
 
   group(target_name) {
     forward_variables_from(invoker, [ "data_deps" ])
     deps = _final_deps
   }
   group("${target_name}_incremental") {
+    data_deps = []
+    forward_variables_from(invoker, [ "data_deps" ])
+    data_deps += [ "//build/android/pylib/device/commands" ]
     deps = _incremental_final_deps
-    if (defined(invoker.data_deps)) {
-      data_deps = invoker.data_deps
-    }
   }
 }
 
 # Declare an Android instrumentation test apk
 #
 # This target creates an Android instrumentation test apk.
 #
 # Variables
 #   android_manifest: Path to AndroidManifest.xml.
 #   data_deps: List of dependencies needed at runtime. These will be built but
@@ skipping 369 matching lines @@
 
 # TODO(GYP): implement this.
 template("uiautomator_test") {
   set_sources_assignment_filter([])
   forward_variables_from(invoker, [ "testonly" ])
   assert(target_name != "")
   assert(invoker.deps != [] || true)
   group(target_name) {
   }
 }