Reland "Roll buildtools fa660d47..ecc8e253"

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 96cbe44f1ca6d5a8ddd2d78217e4f6ab2360c15b..57af185bf57bc78c2f06370682fa8b144f931c21 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -554,6 +554,8 @@ template("jinja_template_resources") {
 # Variables:
 #   sources: List of .pak files. Names must be of the form "en.pak" or
 #       "en-US.pak".
+#   deps: (optional) List of dependencies that might be needed to generate
+#       the .pak files.
 #
 # Example
 #   locale_pak_resources("locale_paks") {
@@ -591,6 +593,10 @@ template("locale_pak_resources") {
       "--depfile",
       rebase_path(depfile, root_build_dir),
     ]
+
+    if (defined(invoker.deps)) {
+      deps = invoker.deps
+    }
   }
 
   group(target_name) {