Android: Roll bundletool 0.12.0 -> 0.13.3

What's New (from: https://github.com/google/bundletool/releases):
- Skip dex merging in universal APK for devices that have multidex support
- Support for keeping resources with given names in the master split.

Bug: 1027124, 1033098
Change-Id: I19964fc25fe4db60b77b4e7901afcf5d53020c38
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2098842Reviewed-by: Clark DuVall <cduvall@chromium.org>
Reviewed-by: Peter Wen <wnwen@chromium.org>
Commit-Queue: Clark DuVall <cduvall@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Auto-Submit: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#749326}

DEPS

@@ -716,7 +716,7 @@ deps = {
       'packages': [
           {
                'package': 'chromium/third_party/android_tools_bundletool',
-               'version': 'P0-ZY8wc-hAu5TZYFH7bId8H9Ucy7mNGCg1IPzXuZpEC',
+               'version': 'Yyhy8FicC3R0ATRzWqGNh4ffsCLz_0nu_BjmNPAdhvIC',
           },
       ],
       'condition': 'checkout_android',

build/android/BUILD.gn

@@ -64,7 +64,7 @@ python_library("test_runner_py") {
   data_deps = [ ":devil_chromium_py" ]
   if (build_with_chromium) {
     data += [
-      "//third_party/android_build_tools/bundletool/bundletool-all-0.12.0.jar",
+      "//third_party/android_build_tools/bundletool/bundletool-all-0.13.3.jar",
       "//tools/android/avd/proto/",
     ]
     data_deps +=
@@ -99,7 +99,7 @@ python_library("resource_sizes_py") {
 python_library("bundle_wrapper_script_py") {
   pydeps_file = "gyp/create_bundle_wrapper_script.pydeps"
   data = [
-    "//third_party/android_build_tools/bundletool/bundletool-all-0.12.0.jar",
+    "//third_party/android_build_tools/bundletool/bundletool-all-0.13.3.jar",
   ]
 }
 

build/android/devil_chromium.json

@@ -130,7 +130,7 @@
       "file_info": {
         "default": {
           "local_paths": [
-            "../../third_party/android_build_tools/bundletool/bundletool-all-0.12.0.jar"
+            "../../third_party/android_build_tools/bundletool/bundletool-all-0.13.3.jar"
           ]
         }
       }

build/android/gyp/bundletool.py

@@ -19,7 +19,7 @@ BUNDLETOOL_DIR = os.path.abspath(os.path.join(
     __file__, '..', '..', '..', '..', 'third_party', 'android_build_tools',
     'bundletool'))
 
-BUNDLETOOL_VERSION = '0.12.0'
+BUNDLETOOL_VERSION = '0.13.3'
 
 BUNDLETOOL_JAR_PATH = os.path.join(
     BUNDLETOOL_DIR, 'bundletool-all-%s.jar' % BUNDLETOOL_VERSION)

third_party/android_build_tools/bundletool/README.chromium

 Name: Android SDK bundletool
 Short Name:  bundletool
-Version: 0.12.0
+Version: 0.13.3
 License: Apache Version 2.0
 License File: NOT_SHIPPED
 Security Critical: No
@@ -13,3 +13,8 @@ It is distributed here as a CIPD package. See cipd.yaml for details.
 Local Modifications:
 None
 
+Update Instructions:
+1. Download the latest .jar from the GitHub Release page.
+  E.g.: https://github.com/google/bundletool/releases
+2. Look at previous commit to //third_party/android_build_tools/bundletools to
+  see what other files need updating.

third_party/android_build_tools/bundletool/cipd.yaml

@@ -10,4 +10,4 @@ description: Android SDK tool to manage App Bundles
 # swarming isolation works properly with symlinks.
 install_mode: copy
 data:
-  - file: bundletool-all-0.12.0.jar
+  - file: bundletool-all-0.13.3.jar