[Android] Update aapt2 to 3.6.0-alpha03-5516695 (reland)

Latest aapt2 is required for enabling resource path shortening.

This also fixes an xml resources size regression for bundles
where raw xml values were being unnecessarily kept.

reason for reland: Fixed data_dep on removed libc++.so

Original CL:
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1669171
> Cr-Commit-Position: refs/heads/master@{#671827}

This reverts commit f063a96b.

Bug: 978664, 753402, 912804
Change-Id: Ifaa6fb44fe9fd3bebd388d88aa53a581cebae543
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1678944
Commit-Queue: Mohamed Heikal <mheikal@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Auto-Submit: Mohamed Heikal <mheikal@chromium.org>
Cr-Commit-Position: refs/heads/master@{#672684}

DEPS

@@ -637,7 +637,7 @@ deps = {
       'packages': [
           {
               'package': 'chromium/third_party/android_build_tools/aapt2',
-              'version': 'j6U3mv7-KG3PSDtVvTwycWzjwvFR1_sSdA540AYxpucC',
+              'version': 'version:3.6.0-alpha03-5516695-cr0',
           },
       ],
       'condition': 'checkout_android',

build/android/gyp/compile_resources.py

@@ -738,6 +738,7 @@ def _PackageApk(options, build):
     link_command += ['--version-name', options.version_name]
   if options.proguard_file:
     link_command += ['--proguard', build.proguard_path]
+    link_command += ['--proguard-minimal-keep-rules']
   if options.proguard_file_main_dex:
     link_command += ['--proguard-main-dex', build.proguard_main_dex_path]
   if options.emit_ids_out:

build/config/android/rules.gni

@@ -4708,7 +4708,6 @@ if (enable_java_templates) {
     }
 
     # Generate a wrapper script for the bundle.
-    _android_aapt2_dir = android_sdk_tools_bundle_aapt2_dir
     _android_aapt2_path = android_sdk_tools_bundle_aapt2
 
     _bundle_apks_path = "$_bundle_base_path/$_bundle_name.apks"
@@ -4728,7 +4727,6 @@ if (enable_java_templates) {
       data = [
         _bundle_wrapper_script_path,
         _android_aapt2_path,
-        _android_aapt2_dir + "/lib64/libc++.so",
         _keystore_path,
       ]
       data_deps = [

third_party/android_build_tools/aapt2/README.chromium

 Name: Android SDK tool aapt2
 Short name: aapt2
-Version: 3.3.0-beta01-5013011
+Version: 3.6.0-alpha03-5516695
 URL:  https://dl.google.com/dl/android/maven2/com/android/tools/build/aapt2/${Version}/aapt2-${Version}-linux.jar
 Security Critical: no
 License: Apache Version 2.0

third_party/android_build_tools/aapt2/cipd.yaml

@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 # To create CIPD package run the following command.
-# cipd create --pkg-def cipd.yaml -tag version:3.3.0-beta01-5013011-cr0
+# cipd create --pkg-def cipd.yaml -tag version:3.6.0-alpha03-5516695-cr0
 package: chromium/third_party/android_build_tools/aapt2
 description: Android SDK tool to build App Bundles
 # TODO(https://crbug.com/950727): Remove this and go back to symlinks once
@@ -11,4 +11,3 @@ description: Android SDK tool to build App Bundles
 install_mode: copy
 data:
   - file: aapt2
-  - file: lib64/libc++.so