Port ChromeSyncShell build rules to GN

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 6e27ce4de82cc4e629fb40817d6f6b1c619d2c5a..89ad4721c2851f47c2794d6b6436ac73007f62e7 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -938,8 +938,8 @@ template("junit_binary") {
       "//testing/android/junit:junit_test_support",
       "//third_party/junit",
       "//third_party/mockito:mockito_java",
-      "//third_party/robolectric:robolectric_java",
       "//third_party/robolectric:android-all-4.3_r2-robolectric-0",
+      "//third_party/robolectric:robolectric_java",
     ]
   }
 }
@@ -1527,8 +1527,8 @@ template("android_apk") {
     proguard(_proguard_target) {
       deps = [
         ":$build_config_target",
-        ":$process_resources_target",
         ":$java_target",
+        ":$process_resources_target",
       ]
       inputs = [
                  _build_config,
@@ -1708,8 +1708,8 @@ template("android_apk") {
 
       native_libs_dir = _native_libs_dir
       deps = [
-        ":${_prepare_native_target_name}",
         ":${_manifest_rule}",
+        ":${_prepare_native_target_name}",
       ]
       incremental_deps = deps
     }
@@ -1770,8 +1770,8 @@ template("android_apk") {
     # actual target, but instead loads them at runtime, we need to explicitly
     # depend on them here.
     public_deps = [
-      ":${_template_name}__create_incremental",
       ":${_create_incremental_script_rule_name}",
+      ":${_template_name}__create_incremental",
       ":${java_target}",
     ]
     if (_native_libs != []) {
@@ -2147,9 +2147,14 @@ template("proto_java_library") {
   action("${_template_name}__protoc_java") {
     srcjar_path = "$target_gen_dir/$target_name.srcjar"
     script = "//build/protoc_java.py"
+
     deps = [
       _protoc_dep,
     ]
+    if (defined(invoker.deps)) {
+      deps += invoker.deps
+    }
+
     sources = invoker.sources
     depfile = "$target_gen_dir/$target_name.d"
     outputs = [