Revert "Android: removing min-api from R8"

This reverts commit 33264a7.

Reason for revert: Since dexdump version has been fixed, this should
now be okay.

Original change's description:
> Android: removing min-api from R8
>
> Bug: 910319
> Change-Id: I5fa81395b39d877e68eb8a49a3d4d1ffab016a39
> Reviewed-on: https://chromium-review.googlesource.com/c/1355855
> Commit-Queue: Sam Maier <smaier@chromium.org>
> Commit-Queue: agrieve <agrieve@chromium.org>
> Reviewed-by: agrieve <agrieve@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#612398}

TBR=agrieve@chromium.org,smaier@chromium.org

Change-Id: Ie31442be0997e04bfcc65a852446e8935d6e2702
Bug: 910319
Reviewed-on: https://chromium-review.googlesource.com/c/1357379
Commit-Queue: Sam Maier <smaier@chromium.org>
Reviewed-by: Sam Maier <smaier@chromium.org>
Reviewed-by: agrieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#612806}

build/android/gyp/dex.py

@@ -301,10 +301,7 @@ def main(args):
   if options.release:
     dex_cmd += ['--release']
   if options.min_api:
-    # TODO(mheikal): Actually pass min-api once catapult/devil dexdump has been
-    # updated. see https://crbug.com/892644
-    # dex_cmd += ['--min-api', options.min_api]
-    pass
+    dex_cmd += ['--min-api', options.min_api]
 
   is_dex = options.dex_path.endswith('.dex')
   is_jar = options.dex_path.endswith('.jar')

build/android/gyp/proguard.py

@@ -131,14 +131,15 @@ def _CreateR8Command(options, map_output_path, output_dir):
       p for p in set(options.classpath) if p not in options.input_paths
   ]
 
-  # TODO(smaier): Add back min-api once crbug.com/892644 is done.
-
   for lib in classpath:
     cmd += ['--lib', lib]
 
   for config_file in options.proguard_configs:
     cmd += ['--pg-conf', config_file]
 
+  if options.min_api:
+    cmd += ['--min-api', options.min_api]
+
   if options.main_dex_rules_path:
     for main_dex_rule in options.main_dex_rules_path:
       cmd += ['--main-dex-rules', main_dex_rule]