Update from https://crrev.com/302630

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("//tools/grit/grit_rule.gni")
 import("//tools/relocation_packer/config.gni")
 
@@ skipping 667 matching lines @@
 #     ]
 #   }
 template("android_library") {
   if (defined(invoker.testonly)) { testonly = invoker.testonly }
 
   assert(defined(invoker.java_files) || defined(invoker.DEPRECATED_java_in_dir)
       || defined(invoker.srcjars) || defined(invoker.srcjar_deps))
   _base_path = "$target_gen_dir/$target_name"
   _build_config = _base_path + ".build_config"
   _jar_path = _base_path + ".jar"
-  _dex_path = _base_path + ".dex.jar"
+  if (defined(invoker.dex_path)) {
+    _dex_path = invoker.dex_path
+  } else {
+    _dex_path = _base_path + ".dex.jar"
+  }
 
   write_build_config("${target_name}__build_config") {
     type = "android_library"
 
     deps = []
     if (defined(invoker.deps)) {
       deps += invoker.deps
     }
 
     build_config = _build_config
@@ skipping 369 matching lines @@
     } else if (defined(invoker.DEPRECATED_java_in_dir)) {
       DEPRECATED_java_in_dir = invoker.DEPRECATED_java_in_dir
     } else {
       java_files = []
     }
     srcjar_deps = _srcjar_deps
     dex_path = base_path + ".dex.jar"
   }
 
   if (_dist_jar_path != "") {
+    final_deps += [ ":${_template_name}__create_dist_jar" ]
     # TODO(cjhopman): This is only ever needed to calculate the list of tests to
     # run. See build/android/pylib/instrumentation/test_jar.py. We should be
     # able to just do that calculation at build time instead.
     action("${_template_name}__create_dist_jar") {
       script = "//build/android/gyp/create_dist_jar.py"
       depfile = "$target_gen_dir/$target_name.d"
       inputs = [ build_config ]
       outputs = [
         depfile,
         _dist_jar_path,
@@ skipping 153 matching lines @@
       "//testing/android/java/src/org/chromium/native_test/ChromeNativeTestActivity.java"
     ]
     android_manifest = "//testing/android/java/AndroidManifest.xml"
     unittests_outputs = [ unittests_binary ]
     native_libs = [unittests_outputs[0]]
     deps = [ "//base:base_java" ]
     if (defined(invoker.deps)) {
       deps += invoker.deps
     }
     datadeps = [
+      "//tools/android/forwarder2",
       "//tools/android/md5sum",
     ]
   }
 }
 
 # 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 196 matching lines @@
 }
 
 # TODO(GYP): implement this.
 template("uiautomator_test") {
   if (defined(invoker.testonly)) { testonly = invoker.testonly }
   assert(target_name != "")
   assert(invoker.deps != [] || true)
   group(target_name) {
   }
 }