Roll aapt2 to ToT to solve non-determinism bug

aapt2 optimize --enable-resource-path-shortening is non-deterministic in
the latest aapt2 release. This is has been fixed in aapt2 ToT.

Also add myself as an OWNER to the package.

Bug: 753402
Change-Id: I356b123251130601c1746dbe5c2fad791cdfbf9f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1749847Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Mohamed Heikal <mheikal@chromium.org>
Cr-Commit-Position: refs/heads/master@{#686420}

DEPS

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

third_party/android_build_tools/aapt2/OWNERS

 digit@chromium.org
 agrieve@chromium.org
 jbudorick@chromium.org
+mheikal@chromium.org
 # COMPONENT: Build

third_party/android_build_tools/aapt2/README.chromium

 Name: Android SDK tool aapt2
 Short name: aapt2
-Version: 3.6.0-alpha03-5516695
+Version: unknown
 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
@@ -12,4 +12,6 @@ file that contains host-specific binaries, which must be extracted. They are
 distributed here as a CIPD package instead. See cipd.yaml for details.
 
 Local Modifications:
-None
+ToT aapt2 branch:goog/master (@9a7341806913471f2f5ab5b2077ff09cdc9285ec)
+This is after 3.6.0-alpha05 (latest released version at time of cut) but before
+3.7.0-alpha01 (the next major version release).

third_party/android_build_tools/aapt2/cipd.yaml

@@ -3,10 +3,10 @@
 # found in the LICENSE file.
 
 # To create CIPD package run the following command.
-# cipd create --pkg-def cipd.yaml -tag version:3.6.0-alpha03-5516695-cr0
+# cipd create --pkg-def cipd.yaml
 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
+# TODO(https://crbug.com/977242): Remove this and go back to symlinks once
 # swarming isolation works properly with symlinks.
 install_mode: copy
 data: