Reland of GN: Enable proguard for apks

build/android/gyp/proguard.py

Index: build/android/gyp/proguard.py
diff --git a/build/android/gyp/proguard.py b/build/android/gyp/proguard.py
index 5997f6125c50e4ec9ecc43201588ec5449c9057e..24843544d9fdcc340962aeafc9ae9fdaedf64b5a 100755
--- a/build/android/gyp/proguard.py
+++ b/build/android/gyp/proguard.py
@@ -26,6 +26,8 @@ def _ParseOptions(args):
   parser.add_option('--is-test', action='store_true',
       help='If true, extra proguard options for instrumentation tests will be '
       'added.')
+  parser.add_option('--tested-apk-info', help='Path to the proguard .info file '
+      'for the tested apk')
   parser.add_option('--classpath', action='append',
                     help='Classpath for proguard.')
   parser.add_option('--stamp', help='Path to touch on success.')
@@ -52,8 +54,8 @@ def main(args):
   if options.mapping:
     proguard.mapping(options.mapping)
 
-  if options.is_test:
-    proguard.is_test(True)
+  if options.tested_apk_info:
+    proguard.tested_apk_info(options.tested_apk_info)
 
   classpath = list(set(options.classpath))
   proguard.libraryjars(classpath)