Annotated functions/classes more cleanly kept

chrome/android/chrome_public_apk_tmpl.gni

Index: chrome/android/chrome_public_apk_tmpl.gni
diff --git a/chrome/android/chrome_public_apk_tmpl.gni b/chrome/android/chrome_public_apk_tmpl.gni
index 765438a6bc4649eb37c14607edab08b8af6a879d..78cd4cb46cd1e7c338f5f9c243f73c6a04f7c4ff 100644
--- a/chrome/android/chrome_public_apk_tmpl.gni
+++ b/chrome/android/chrome_public_apk_tmpl.gni
@@ -48,8 +48,10 @@ template("chrome_public_apk_tmpl") {
         _prev_proguard_configs = proguard_configs
       }
       proguard_configs = []
-      proguard_configs =
-          [ "//chrome/android/java/proguard.flags" ] + _prev_proguard_configs
+      proguard_configs = _prev_proguard_configs + [
+                           "//chrome/android/java/proguard.flags",
+                           "//base/android/base_proguard_config.flags",
+                         ]
       if (!enable_all_proguard_optimizations) {
         proguard_configs += [ "//testing/android/proguard_for_test.flags" ]
       }