Refactor base's proguard flags to be more usable by cronet

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 eda782673485f0f74a259504bce0f11d953b6f39..ee4d8e5cbe4dc91f6a339204816c748a569df096 100644
--- a/chrome/android/chrome_public_apk_tmpl.gni
+++ b/chrome/android/chrome_public_apk_tmpl.gni
@@ -49,8 +49,8 @@ template("chrome_public_apk_tmpl") {
       }
       proguard_configs += [
         "//chrome/android/java/proguard.flags",
-        "//base/android/base_proguard_config.flags",
-        "//base/android/release_proguard_config.flags",
+        "//base/android/proguard/chromium_apk.flags",
+        "//base/android/proguard/chromium_code.flags",
       ]
     }