Update from https://crrev.com/307664

build/config/android/rules.gni

Index: build/config/android/rules.gni
diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
index 5d0cb372388f729608e30c4c27e8dec2b8415e0d..5075da9e6f6c130f961862faf0153531b4606515 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -922,8 +922,6 @@ template("java_prebuilt") {
 #
 #   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
@@ -986,9 +984,6 @@ template("android_library") {
     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
@@ -1005,6 +1000,20 @@ template("android_library") {
   }
 }
 
+# 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
@@ -1399,8 +1408,7 @@ template("android_apk") {
   group(target_name) {
     deps = final_deps
     if (defined(invoker.datadeps)) {
-      # TODO(cjhopman): Fix this when group datadeps works.
-      deps += invoker.datadeps
+      datadeps = invoker.datadeps
     }
   }
 }
@@ -1455,6 +1463,9 @@ template("unittest_apk") {
       "//tools/android/forwarder2",
       "//tools/android/md5sum",
     ]
+    if (defined(invoker.datadeps)) {
+      datadeps += invoker.datadeps
+    }
   }
 }