Synchronize GN build configuration with Chrome

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 0c135b362893b073904b951598c7b7f644386c08..aa5fe9e75a6b32314f91396e0b8f2a545e4524f1 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -324,7 +324,7 @@ template("java_cpp_template") {
     if (defined(invoker.visibility)) {
       visibility = invoker.visibility
     }
-    deps = [
+    public_deps = [
       ":$zip_srcjar_target_name",
     ]
   }
@@ -411,7 +411,7 @@ template("java_cpp_enum") {
     if (defined(invoker.visibility)) {
       visibility = invoker.visibility
     }
-    deps = [
+    public_deps = [
       ":$zip_srcjar_target_name",
     ]
   }
@@ -1860,7 +1860,9 @@ template("unittest_apk") {
     if (defined(invoker.deps)) {
       deps += invoker.deps
     }
-    data_deps = [ "//tools/android/md5sum" ]
+    data_deps = [
+      "//tools/android/md5sum",
+    ]
     if (host_os == "linux") {
       data_deps += [ "//tools/android/forwarder2" ]
     }