Update from https://crrev.com/307664

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 904 matching lines @@
 #   chromium_code: If true, extra analysis warning/errors will be enabled.
 #   jar_excluded_patterns: List of patterns of .class files to exclude from the
 #     final jar.
 #
 #   proguard_preprocess: If true, proguard preprocessing will be run. This can
 #     be used to remove unwanted parts of the library.
 #   proguard_config: Path to the proguard config for preprocessing.
 #
 #   dex_path: If set, the resulting .dex.jar file will be placed under this
 #     path.
-#   standalone_dex_path: If set, a standalone .dex.jar containing the code from
-#     the library and all dependencies will be placed under this path.
 #
 #
 # Example
 #   android_library("foo_java") {
 #     java_files = [
 #       "android/org/chromium/foo/Foo.java",
 #       "android/org/chromium/foo/FooInterface.java",
 #       "android/org/chromium/foo/FooService.java",
 #     ]
 #     deps = [
@@ skipping 42 matching lines @@
     }
     if (defined(invoker.testonly)) {
       testonly = invoker.testonly
     }
     if (defined(invoker.visibility)) {
       visibility = invoker.visibility
     }
     if (defined(invoker.dex_path)) {
       dex_path = invoker.dex_path
     }
-    if (defined(invoker.standalone_dex_path)) {
-      standalone_dex_path = invoker.standalone_dex_path
-    }
 
     supports_android = true
     requires_android = true
 
     if (!defined(jar_excluded_patterns)) {
       jar_excluded_patterns = []
     }
     jar_excluded_patterns += [
       "*/R.class",
       "*/R##*.class",
       "*/Manifest.class",
       "*/Manifest##*.class",
     ]
   }
 }
 
+# Declare a target that packages a set of Java dependencies into a standalone
+# .dex.jar.
+#
+# Variables
+#   deps: specifies the dependencies of this target. Android libraries in deps
+#     will be packaged into the resulting .dex.jar file.
+#   dex_path: location at which the output file will be put
+template("android_standalone_library") {
+  deps_dex(target_name) {
+    deps = invoker.deps
+    dex_path = invoker.dex_path
+  }
+}
+
 # Declare an Android library target for a prebuilt jar
 #
 # This target creates an Android library containing java code and Android
 # resources.
 #
 # Variables
 #   deps: Specifies the dependencies of this target. Java targets in this list
 #     will be added to the javac classpath. Android resources in dependencies
 #     will be used when building this library.
 #   jar_path: Path to the prebuilt jar.
@@ skipping 374 matching lines @@
 
     if (_native_libs != []) {
       native_libs_dir = _native_libs_dir
       deps += [ ":${_template_name}__prepare_native" ]
     }
   }
 
   group(target_name) {
     deps = final_deps
     if (defined(invoker.datadeps)) {
-      # TODO(cjhopman): Fix this when group datadeps works.
-      deps += invoker.datadeps
+      datadeps = invoker.datadeps
     }
   }
 }
 
 # Declare an Android gtest apk
 #
 # This target creates an Android apk for running gtest-based unittests.
 #
 # Variables
 #   deps: Specifies the dependencies of this target. These will be passed to
@@ skipping 34 matching lines @@
     deps = [
       "//base:base_java",
     ]
     if (defined(invoker.deps)) {
       deps += invoker.deps
     }
     datadeps = [
       "//tools/android/forwarder2",
       "//tools/android/md5sum",
     ]
+    if (defined(invoker.datadeps)) {
+      datadeps += invoker.datadeps
+    }
   }
 }
 
 # 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.
 #
 # Variables
 #   sources: Paths to .aidl files to compile.
@@ skipping 208 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) {
   }
 }