Make chrome_public_apk, not chrome_staging_java depend on chrome_template_resources

chrome/android/BUILD.gn

Index: chrome/android/BUILD.gn
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index d9fae8accc090295a20f907567e6067d47b5e932..055e8edad49a8b1f01cc91d9c73d572379e68103 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -621,7 +621,6 @@ android_resources("chrome_staging_java_resources") {
   ]
   custom_package = "com.google.android.apps.chrome"
   deps = [
-    ":chrome_template_resources",
     "//chrome/android:chrome_java_resources",
     "//components/policy:app_restrictions_resources",
     "//third_party/android_tools:android_support_v7_appcompat_resources",
@@ -632,16 +631,6 @@ android_resources("chrome_staging_java_resources") {
   }
 }
 
-# GYP: //chrome/android/chrome_apk.gyp:chrome_template_resources
-jinja_template_resources("chrome_template_resources") {
-  resources = [
-    "java_staging/res_template/xml/searchable.xml",
-    "java_staging/res_template/xml/syncadapter.xml",
-  ]
-  res_dir = "java_staging/res_template"
-  variables = jinja_variables
-}
-
 # GYP: //chrome/android/chrome_apk.gyp:chrome_staging_test_java
 android_library("chrome_staging_test_java") {
   testonly = true
@@ -764,6 +753,16 @@ jinja_template("chrome_public_apk_manifest") {
   variables = jinja_variables + [ "min_sdk_version=16" ]
 }
 
+# GYP: //chrome/android/chrome_apk.gyp:chrome_public_template_resources
+jinja_template_resources("chrome_public_template_resources") {
+  resources = [
+    "java_staging/res_template/xml/searchable.xml",
+    "java_staging/res_template/xml/syncadapter.xml",
+  ]
+  res_dir = "java_staging/res_template"
+  variables = jinja_variables
+}
+
 # GYP: //chrome/android/chrome_apk.gyp:libchrome_public
 shared_library("chrome_public") {
   deps = [
@@ -804,6 +803,7 @@ android_apk("chrome_public_apk") {
     ":chrome_public",
     ":chrome_public_apk_assets",
     ":chrome_public_apk_manifest",
+    ":chrome_public_template_resources",
     "//base:base_java",
     "//third_party/android_tools:google_play_services_default_resources",
   ]