Snap for 11206181 from f4055a1c797fedd4a98ea8d2a255d91e94853135 to 24Q1-releaseandroid-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-release

Change-Id: I6df1acd55d6d01483d492433ca36b89439b31c07

70 files changed, 55 insertions, 277 deletions

diff --git a/Android.bp b/Android.bp
index 3c8a90e..a0552c0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -41,7 +41,7 @@ java_import_host {
         // tools/lib/lint-classpath.jar needed to provide dependencies
         // of lint-api.jar and lint-checks.jar.
         "tools/lib/external/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar",
-        "tools/lib/external/com/google/guava/guava/31.1-jre/guava-31.1-jre.jar",
+        "tools/lib/external/com/google/guava/guava/32.0.1-jre/guava-32.0.1-jre.jar",
         "tools/lib/external/lint-psi/intellij-core/intellij-core-mvn.jar",
         "tools/lib/external/lint-psi/kotlin-compiler/kotlin-compiler-mvn.jar",
         "tools/lib/external/lint-psi/uast/uast.jar",
@@ -111,9 +111,9 @@ java_import_host {
     jars: [
         "lint-tests.jar",
         "tools/lib/common/tools.common.jar",
-        "tools/lib/external/org/ow2/asm/asm/9.3/asm-9.3.jar",
-        "tools/lib/external/org/ow2/asm/asm-analysis/9.3/asm-analysis-9.3.jar",
-        "tools/lib/external/org/ow2/asm/asm-tree/9.3/asm-tree-9.3.jar",
+        "tools/lib/external/org/ow2/asm/asm/9.6/asm-9.6.jar",
+        "tools/lib/external/org/ow2/asm/asm-analysis/9.6/asm-analysis-9.6.jar",
+        "tools/lib/external/org/ow2/asm/asm-tree/9.6/asm-tree-9.6.jar",
         "tools/lib/layoutlib-api/tools.layoutlib-api.jar",
         "tools/lib/lint/cli/cli.jar",
         "tools/lib/sdk-common/tools.sdk-common.jar",
diff --git a/lint-tests.jar b/lint-tests.jar
index bcda738..22a7189 100644
--- a/lint-tests.jar
+++ b/lint-tests.jar
diff --git a/manifest.xml b/manifest.xml
index 37bef98..249814d 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -7,7 +7,7 @@
 
   <superproject name="platform/superproject/base" remote="goog" revision="studio-main" />
 
-  <project path="tools/buildSrc" name="platform/tools/buildSrc" revision="e08dbdef8363233ec25a08abbd46dca09fdd7606">
+  <project path="tools/buildSrc" name="platform/tools/buildSrc" revision="ad6ccfefd16246fb232fa3228791c2a2f0cce0f8">
     <linkfile dest="tools/build.gradle" src="base/build.gradle" />
 
     <linkfile dest="tools/gradle.properties" src="base/gradle.properties" />
@@ -21,7 +21,7 @@
 
   <project path="external/dexter" name="platform/tools/dexter" revision="74c2cf6b983956ac8e9a23422a4d6a08c0019bf5" />
 
-  <project path="external/doclava" name="platform/external/doclava" revision="c37f0ff7a075597a81e4ad9e19854bebda8931c9" />
+  <project path="external/doclava" name="platform/external/doclava" revision="512ec266ba3aa10dfd7e6c3e247d7c6a90257616" />
 
   <project path="external/dokka" name="platform/external/dokka" groups="pdk" clone-depth="1" revision="8541ac1c032c1641578d2964553222f01a265f2d" />
 
@@ -31,7 +31,7 @@
 
   <project path="external/googletest" name="platform/external/googletest" revision="5c08f92c881b666998a4f7852c3cf9e393bf33a7" />
 
-  <project path="external/grpc-grpc" name="platform/external/grpc-grpc" revision="e75b72ca5cb222ac9847ffd63734e4e87194a1ef" />
+  <project path="external/grpc-grpc" name="platform/external/grpc-grpc" revision="7b430f32adaf3d0fc37f82225dd23e3f93707572" />
 
   <project path="external/jarjar" name="platform/external/jarjar" revision="741153e06175fbe4c2da2ad2ab8b704d9ab30259" />
 
@@ -41,17 +41,21 @@
 
   <project path="external/libpng" name="platform/external/libpng" revision="eafc399bc0f7bce56744f7c57e26d93e34a39cd9" upstream="udc-release" />
 
-  <project path="external/nanopb-c" name="platform/external/nanopb-c" revision="7e9017e31789501645e31f73af33d1dce4586619" />
+  <project path="external/android/system/logging" name="platform/system/logging" clone-depth="1" revision="2a8812ee44c811bb0cb7d0f388a355b462c6be81" />
+
+  <project path="external/nanopb-c" name="platform/external/nanopb-c" revision="e90dd6b4b2809aa628e748e134f885683dfa7dba" />
 
   <project path="external/perfetto" name="platform/external/perfetto" revision="31155364cd4e79d09c92df884510e149ca67df5e" />
 
   <project path="external/protobuf" name="platform/external/protobuf" revision="31e0674101933b61a540bf3a858ac7797e0f125d" />
 
+  <project path="external/python/absl-py" name="platform/external/python/absl-py" revision="bd7cdd4d3776c9d08bbfea96d711958b24a9fe9c" />
+
   <project path="external/skia" name="platform/external/skia" revision="0a1502782144e54d9a50ccaa3f5d0d09bc73cadb" clone-depth="1" upstream="udc-release" />
 
-  <project path="external/zlib" name="platform/external/zlib" revision="85bf6378540857c1bc26186503fd0515427285af" />
+  <project path="external/zlib" name="platform/external/zlib" revision="9760bae4db96d6fad9a6ec397bb804f15d3cb73d" />
 
-  <project path="frameworks/layoutlib" name="platform/frameworks/layoutlib" clone-depth="1" revision="31edc1ae28a40af20cb8ba41028e7cee5aff96d6" upstream="udc-layoutlib-native" groups="notdefault,layoutlib" />
+  <project path="frameworks/layoutlib" name="platform/frameworks/layoutlib" clone-depth="1" revision="aae8dd05cf194f568350253fa49b88dde39b4990" upstream="udc-layoutlib-native" groups="notdefault,layoutlib" />
 
   <project path="prebuilts/clang/host/darwin-x86" name="platform/prebuilts/clang/host/darwin-x86" clone-depth="1" groups="notdefault,platform-darwin" revision="4aaead81b6c35a7f10ac51bccf97c3ffc768aabe" />
 
@@ -65,17 +69,17 @@
 
   <project path="prebuilts/python/windows-x86" name="platform/prebuilts/python/windows-x86" clone-depth="1" revision="6afb84b14219361d32631cf71a7b8076b4673e03" />
 
-  <project path="prebuilts/r8" name="platform/prebuilts/r8" clone-depth="1" revision="f825980831d7b94d92ecc6f01cbbfc385f31dd0f" />
+  <project path="prebuilts/r8" name="platform/prebuilts/r8" clone-depth="1" revision="0c6d43f5467a2737ef15ede50801cbc5138eb842" />
 
-  <project path="prebuilts/studio/jdk" name="platform/prebuilts/studio/jdk" clone-depth="1" revision="3c2db2aa8cd0ebfbf43977735b3ec5a66508bccf" />
+  <project path="prebuilts/studio/jdk" name="platform/prebuilts/studio/jdk" clone-depth="1" revision="5f82a2e85429b1acc00992a228ff83fd6a8870aa" />
 
-  <project path="prebuilts/studio/layoutlib" name="platform/prebuilts/studio/layoutlib" clone-depth="1" revision="01203d9c7a6ec12dfdfc747fee64a2524dc5de9a" />
+  <project path="prebuilts/studio/layoutlib" name="platform/prebuilts/studio/layoutlib" clone-depth="1" revision="f94d268c9218669c7b8fff0f8ab7655b76e95a26" />
 
-  <project path="prebuilts/tools" name="platform/prebuilts/tools" clone-depth="1" revision="18a40f8539277bc5960cab03202aa908abea86e3" />
+  <project path="prebuilts/tools" name="platform/prebuilts/tools" clone-depth="1" revision="f9232e45eda1ae0c1656051cb24fe9e1c6bb6cd0" />
 
-  <project path="tools/adt/idea" name="platform/tools/adt/idea" revision="499a72860dbb696db90ee1170c72eac743bfd1dc" />
+  <project path="tools/adt/idea" name="platform/tools/adt/idea" revision="a20e62b3569fff698c7eb0b2c89a3a20ad2b837b" />
 
-  <project path="tools/analytics-library" name="platform/tools/analytics-library" revision="915b5152c2528351d3cd659921a7cfa1bb19f142" />
+  <project path="tools/analytics-library" name="platform/tools/analytics-library" revision="e9a6442672c32866817e1ba5ce0e71815b36c483" />
 
   <project path="tools/apksig" name="platform/tools/apksig" revision="c8811a8c5bfa362bfb4473f83473ba41b79455c2" />
 
@@ -83,7 +87,7 @@
 
   <project path="tools/assets" name="assets/android-studio-ux-assets" clone-depth="1" revision="12cb5d3f886788b74450295f62da9d7517e7ba94" />
 
-  <project path="tools/base" name="platform/tools/base" revision="b1f410241ef702949483da737113e6ea99247c51">
+  <project path="tools/base" name="platform/tools/base" revision="5a9d28bc83b3435b9649c3c4d9cf689cbbbbc9cc">
     <linkfile dest="tools/BUILD.bazel" src="bazel/tools.BUILD.bazel" />
 
     <linkfile dest="WORKSPACE" src="bazel/toplevel.WORKSPACE" />
@@ -101,47 +105,47 @@
     <linkfile dest="prebuilts/clang/studio-extra/wrapped_ar.darwin" src="bazel/toolchains/darwin/wrapped_ar" />
 </project>
 
-  <project path="tools/data-binding" name="platform/frameworks/data-binding" revision="108e14e9bb5a7b522bc6bf7dffbe72adb7e9b22f" />
+  <project path="tools/data-binding" name="platform/frameworks/data-binding" revision="855177808ddc495cad3d9ec6e09c1ed1c529ef5f" />
 
   <project path="tools/external/bazelbuild-rules-kotlin" name="platform/tools/external/bazelbuild-rules-kotlin" revision="cab5eaffc2012dfe46260c03d6419c0d2fa10be0" />
 
   <project path="tools/external/fat32lib" name="platform/tools/external/fat32lib" revision="5d8a9ce6a1801939006a451dfffe4f11d6211cfb" />
 
-  <project path="tools/external/gradle" name="platform/tools/external/gradle" clone-depth="1" revision="b396dcc678b753eb7bd3c528e259918f4506a6e9" />
+  <project path="tools/external/gradle" name="platform/tools/external/gradle" clone-depth="1" revision="0b2646633292f08997203c7fddfa0bd101ded4f1" />
 
-  <project path="tools/gradle" name="platform/tools/gradle" revision="10fc79c2fefb98e0ca091d5b143bcf40153d6e96" />
+  <project path="tools/gradle" name="platform/tools/gradle" revision="e04a1123f0a42dcc2d59357056a14883bfab5328" />
 
-  <project path="tools/gradle-recipes" name="platform/tools/gradle-recipes" revision="8891c6dab8ff511045eed5065ad7989317221d02" />
+  <project path="tools/gradle-recipes" name="platform/tools/gradle-recipes" revision="8e26ab362a81ef78d16eadd4400ee6ec5e9b4f94" />
 
-  <project path="tools/idea" name="platform/tools/idea" revision="c2583f9e8516abb4f0ad39e51e70faa2da563f5f" />
+  <project path="tools/idea" name="platform/tools/idea" revision="efe3d841f46f0aa915bf12ed56cfd2c7c5501f9d" />
 
   <project path="tools/repohooks" name="platform/tools/repohooks" revision="f37726d2268fe61ef1697ecb32963657a45b3964" />
 
   <project path="tools/sherpa" name="platform/frameworks/opt/sherpa" revision="c0de6383b1db33a235451a7b0f806a0b2d1fae6a" />
 
-  <project path="tools/studio/google/cloud/testing" name="platform/tools/studio/google/cloud/testing" revision="a3f270b4e9b3f3cf260751db4549d961adc2febc" />
+  <project path="tools/studio/google/cloud/testing" name="platform/tools/studio/google/cloud/testing" revision="f9eab98e3bd7174b125d997f0aafbbb547efdeca" />
 
-  <project path="tools/studio/google/cloud/tools" name="platform/tools/studio/google/cloud/tools" revision="d3e18b5c31920a4a2e24aa52adf55dd4f1e5f97f" />
+  <project path="tools/studio/google/cloud/tools" name="platform/tools/studio/google/cloud/tools" revision="f223aaea72bcbc1a00d4613d71282c9a4095ee1a" />
 
-  <project path="tools/swing-testing" name="platform/tools/swing-testing" revision="4304aa5ff6a7e2d25ca257f377a321498e63f142" />
+  <project path="tools/swing-testing" name="platform/tools/swing-testing" revision="02b8679e02caa4b83bc2b06e2925a7e0c7cff7cb" />
 
-  <project path="tools/vendor/google" name="platform/tools/vendor/google" revision="19c2e756bde87a01fc706301c8457ad73d89850d" />
+  <project path="tools/vendor/google" name="platform/tools/vendor/google" revision="dc6a6a81e4e3a75633d3d0ab81af7864924dbb76" />
 
-  <project path="tools/vendor/google3/blaze" name="platform/tools/vendor/google3/blaze" revision="6a3a6bef18ea1cb42409023d03ac40187d55d44a" />
+  <project path="tools/vendor/google3/blaze" name="platform/tools/vendor/google3/blaze" revision="6933a459e7a6dd81a3d408bf1b6e7f3315aa6531" />
 
   <project path="tools/vendor/intel" name="platform/tools/vendor/intel" revision="1212619833f94165022ac6ba46a434d88fef37b4" />
 
-  <project path="tools/vendor/intellij/cidr" name="platform/tools/vendor/intellij/cidr" revision="72db17611e1e9e470693e4eb4b320e353ab453aa" />
+  <project path="tools/vendor/intellij/cidr" name="platform/tools/vendor/intellij/cidr" revision="34a2047e59a136d89aeaf6a587113885919805df" />
 
-  <project path="tools/vendor/adt_infra_internal" name="platform/tools/adt_infra_internal" groups="adt-infra" revision="5338cc9fc3ef23235ca0c0102ee6c766a6d36f08" />
+  <project path="tools/vendor/adt_infra_internal" name="platform/tools/adt_infra_internal" groups="adt-infra" revision="003374c67bfd24e8f86dc2fe354dc3f60a44147b" />
 
-  <project path="prebuilts/studio/buildbenchmarks" name="platform/tools/vendor/google_prebuilt/buildbenchmarks" clone-depth="1" revision="a84b5ec7cc3232fd56024fabaa04ff7b06cfdcf1" />
+  <project path="prebuilts/studio/buildbenchmarks" name="platform/tools/vendor/google_prebuilt/buildbenchmarks" clone-depth="1" revision="2161b2b0eeaf67542cce650f39f460bc98876065" />
 
   <project path="prebuilts/android-emulator" name="platform/prebuilts/android-emulator" clone-depth="1" revision="260b7e55cf3cab6efa5d07afddb971ab677ceee0" />
 
-  <project path="prebuilts/studio/sdk/remote" name="platform/tools/google_prebuilts/studio/sdk/remote" clone-depth="1" revision="085bbe4dafcbad6db500917991bd35a5a450c7cf" />
+  <project path="prebuilts/studio/sdk/remote" name="platform/tools/google_prebuilts/studio/sdk/remote" clone-depth="1" revision="ca0d61a5587a77d861a4484484fb4b86ff490aac" />
 
-  <project path="prebuilts/studio/intellij-sdk" name="platform/tools/vendor/google_prebuilts/studio/intellij-sdk" clone-depth="1" revision="1cc83c4c1209d6173ca0b3f6e65074fce2d4041b" />
+  <project path="prebuilts/studio/intellij-sdk" name="platform/tools/vendor/google_prebuilts/studio/intellij-sdk" clone-depth="1" revision="ef3a9f912ec2fbfba480222cbf1b111296105c7d" />
 
   <project path="prebuilts/studio/sdk/darwin" name="platform/tools/vendor/google_prebuilts/studio/sdk/darwin" clone-depth="1" groups="notdefault,platform-darwin" revision="15ab5c04490adf5c9927add497806084e42b63e0" />
 
@@ -149,7 +153,7 @@
 
   <project path="prebuilts/studio/sdk/windows" name="platform/tools/vendor/google_prebuilts/studio/sdk/windows" clone-depth="1" groups="notdefault,platform-windows" revision="722688aa150e854a3598eddb5a2215b2135a83a2" />
 
-  <project path="prebuilts/remoteexecution-client" name="platform/prebuilts/remoteexecution-client" revision="e7b3b88161756e078f5088f67c9ff66d05b58f2b" clone-depth="1" />
+  <project path="prebuilts/remoteexecution-client" name="platform/prebuilts/remoteexecution-client" revision="b96f76c9e0eba5587652475671534c7158b973c5" clone-depth="1" />
 
   <repo-hooks in-project="platform/tools/repohooks" enabled-list="pre-upload" />
 </manifest>
diff --git a/tools/NOTICE.txt b/tools/NOTICE.txt
index 24e131a..f5b7e0d 100755
--- a/tools/NOTICE.txt
+++ b/tools/NOTICE.txt
@@ -1,10 +1,10 @@
 ============================================================
 Notices for file(s):
-kotlin-stdlib-1.9.20-Beta.NOTICE
-kotlin-stdlib-jdk7-1.9.20-Beta.NOTICE
-kotlin-stdlib-jdk8-1.9.20-Beta.NOTICE
-kotlin-reflect-1.9.20-Beta.NOTICE
-kotlin-stdlib-common-1.9.20-Beta.NOTICE
+kotlin-stdlib-1.9.20-RC.NOTICE
+kotlin-stdlib-jdk7-1.9.20-RC.NOTICE
+kotlin-stdlib-jdk8-1.9.20-RC.NOTICE
+kotlin-reflect-1.9.20-RC.NOTICE
+kotlin-stdlib-common-1.9.20-RC.NOTICE
 ------------------------------------------------------------
 /*
  * Copyright 2010-2015 JetBrains s.r.o.
@@ -69,7 +69,7 @@ IN THE SOFTWARE.
  
 ============================================================
 Notices for file(s):
-checker-qual-3.21.2.NOTICE
+checker-qual-3.33.0.NOTICE
 ------------------------------------------------------------
 Most of the Checker Framework is licensed under the GNU General Public
 License, version 2 (GPL2), with the classpath exception.  The text of this
@@ -129,14 +129,14 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 Notices for file(s):
 jna-5.6.0.NOTICE
 jna-platform-5.6.0.NOTICE
-annotations-13.0.NOTICE
+annotations-23.0.0.NOTICE
 failureaccess-1.0.1.NOTICE
 listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.NOTICE
 jsr305-3.0.2.NOTICE
-error_prone_annotations-2.16.NOTICE
-j2objc-annotations-1.3.NOTICE
-guava-31.1-jre.NOTICE
-gson-2.10.NOTICE
+error_prone_annotations-2.18.0.NOTICE
+j2objc-annotations-2.8.NOTICE
+guava-32.0.1-jre.NOTICE
+gson-2.10.1.NOTICE
 jimfs-1.1.NOTICE
 commons-compress-1.21.NOTICE
 FastInfoset-1.2.16.NOTICE
@@ -145,6 +145,7 @@ commons-logging-1.2.NOTICE
 commons-codec-1.15.NOTICE
 httpclient-4.5.14.NOTICE
 httpmime-4.5.6.NOTICE
+commons-io-2.13.0.NOTICE
 ------------------------------------------------------------
 
                                  Apache License
@@ -569,215 +570,6 @@ jcommander-1.78.NOTICE
    limitations under the License.
 ============================================================
 Notices for file(s):
-commons-io-2.4.NOTICE
-------------------------------------------------------------
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-
-
-============================================================
-Notices for file(s):
 trove4j-1.0.20200330.NOTICE
 ------------------------------------------------------------
 		  GNU LESSER GENERAL PUBLIC LICENSE
@@ -1584,7 +1376,7 @@ Content of http://www.apache.org/licenses/LICENSE-2.0:
    limitations under the License.
 ============================================================
 Notices for file(s):
-protobuf-java-3.19.3.NOTICE
+protobuf-java-3.22.3.NOTICE
 ------------------------------------------------------------
 This license applies to all parts of Protocol Buffers except the following:
 
@@ -1630,24 +1422,6 @@ standalone and requires a support library to be linked with it.  This
 support library is itself covered by the above license.
 ============================================================
 Notices for file(s):
-xml-apis-1.4.01.NOTICE
-xercesImpl-2.12.0.NOTICE
-------------------------------------------------------------
-   Apache Xerces Java
-   Copyright 1999-2006 The Apache Software Foundation
-
-   This product includes software developed at
-   The Apache Software Foundation (http://www.apache.org/).
-
-   Portions of Apache Xerces Java in xercesImpl.jar and xml-apis.jar
-   were originally based on the following:
-     - software copyright (c) 1999, IBM Corporation., http://www.ibm.com.
-     - software copyright (c) 1999, Sun Microsystems., http://www.sun.com.
-     - voluntary contributions made by Paul Eng on behalf of the
-       Apache Software Foundation that were originally developed at iClick, Inc.,
-       software copyright (c) 1999.
-============================================================
-Notices for file(s):
 kotlinx-cli-jvm-0.3.1.NOTICE
 ------------------------------------------------------------
                                  Apache License
@@ -1944,9 +1718,9 @@ The code released under the CDDL shall be governed by the laws of the State of C
 
 ============================================================
 Notices for file(s):
-asm-9.3.NOTICE
-asm-tree-9.3.NOTICE
-asm-analysis-9.3.NOTICE
+asm-9.6.NOTICE
+asm-tree-9.6.NOTICE
+asm-analysis-9.6.NOTICE
 ------------------------------------------------------------
 Copyright (c) 2000-2011 INRIA, France Telecom
 All rights reserved.
diff --git a/tools/lib/analytics-library/protos/src/main/proto/proto.jar b/tools/lib/analytics-library/protos/src/main/proto/proto.jar
index 2a82b60..5ecb346 100755
--- a/tools/lib/analytics-library/protos/src/main/proto/proto.jar
+++ b/tools/lib/analytics-library/protos/src/main/proto/proto.jar
diff --git a/tools/lib/analytics-library/shared/tools.analytics-shared.jar b/tools/lib/analytics-library/shared/tools.analytics-shared.jar
index eacb14a..e9ff352 100755
--- a/tools/lib/analytics-library/shared/tools.analytics-shared.jar
+++ b/tools/lib/analytics-library/shared/tools.analytics-shared.jar
diff --git a/tools/lib/analytics-library/tracker/tools.analytics-tracker.jar b/tools/lib/analytics-library/tracker/tools.analytics-tracker.jar
index 0547ce9..7023ce9 100755
--- a/tools/lib/analytics-library/tracker/tools.analytics-tracker.jar
+++ b/tools/lib/analytics-library/tracker/tools.analytics-tracker.jar
diff --git a/tools/lib/apkanalyzer-classpath.jar b/tools/lib/apkanalyzer-classpath.jar
index 4f0e864..6c9ce62 100755
--- a/tools/lib/apkanalyzer-classpath.jar
+++ b/tools/lib/apkanalyzer-classpath.jar
diff --git a/tools/lib/avdmanager-classpath.jar b/tools/lib/avdmanager-classpath.jar
index e2fd22d..7110094 100755
--- a/tools/lib/avdmanager-classpath.jar
+++ b/tools/lib/avdmanager-classpath.jar
diff --git a/tools/lib/build-system/aapt2-proto/aapt2-proto.jar b/tools/lib/build-system/aapt2-proto/aapt2-proto.jar
index d57a607..62fb10f 100755
--- a/tools/lib/build-system/aapt2-proto/aapt2-proto.jar
+++ b/tools/lib/build-system/aapt2-proto/aapt2-proto.jar
diff --git a/tools/lib/build-system/builder-model/builder-model.jar b/tools/lib/build-system/builder-model/builder-model.jar
index ca5aea9..3de5c32 100755
--- a/tools/lib/build-system/builder-model/builder-model.jar
+++ b/tools/lib/build-system/builder-model/builder-model.jar
diff --git a/tools/lib/build-system/shrinker/libshrinker.jar b/tools/lib/build-system/shrinker/libshrinker.jar
index 6f63548..7ab0515 100755
--- a/tools/lib/build-system/shrinker/libshrinker.jar
+++ b/tools/lib/build-system/shrinker/libshrinker.jar
diff --git a/tools/lib/build-system/tools.manifest-merger.jar b/tools/lib/build-system/tools.manifest-merger.jar
index d07ef46..77e96fd 100755
--- a/tools/lib/build-system/tools.manifest-merger.jar
+++ b/tools/lib/build-system/tools.manifest-merger.jar
diff --git a/tools/lib/common/tools.common.jar b/tools/lib/common/tools.common.jar
index bf46678..db55ff5 100755
--- a/tools/lib/common/tools.common.jar
+++ b/tools/lib/common/tools.common.jar
diff --git a/tools/lib/ddmlib/tools.ddmlib.jar b/tools/lib/ddmlib/tools.ddmlib.jar
index 234ebc4..311a85c 100755
--- a/tools/lib/ddmlib/tools.ddmlib.jar
+++ b/tools/lib/ddmlib/tools.ddmlib.jar
diff --git a/tools/lib/external/com/google/code/gson/gson/2.10.1/gson-2.10.1.jar b/tools/lib/external/com/google/code/gson/gson/2.10.1/gson-2.10.1.jar
new file mode 100755
index 0000000..a88c5bd
--- /dev/null
+++ b/tools/lib/external/com/google/code/gson/gson/2.10.1/gson-2.10.1.jar
diff --git a/tools/lib/external/com/google/code/gson/gson/2.10/gson-2.10.jar b/tools/lib/external/com/google/code/gson/gson/2.10/gson-2.10.jar
deleted file mode 100755
index 4b57f5b..0000000
--- a/tools/lib/external/com/google/code/gson/gson/2.10/gson-2.10.jar
+++ /dev/null
diff --git a/tools/lib/external/com/google/errorprone/error_prone_annotations/2.16/error_prone_annotations-2.16.jar b/tools/lib/external/com/google/errorprone/error_prone_annotations/2.16/error_prone_annotations-2.16.jar
deleted file mode 100755
index d995431..0000000
--- a/tools/lib/external/com/google/errorprone/error_prone_annotations/2.16/error_prone_annotations-2.16.jar
+++ /dev/null
diff --git a/tools/lib/external/com/google/errorprone/error_prone_annotations/2.18.0/error_prone_annotations-2.18.0.jar b/tools/lib/external/com/google/errorprone/error_prone_annotations/2.18.0/error_prone_annotations-2.18.0.jar
new file mode 100755
index 0000000..e072fe0
--- /dev/null
+++ b/tools/lib/external/com/google/errorprone/error_prone_annotations/2.18.0/error_prone_annotations-2.18.0.jar
diff --git a/tools/lib/external/com/google/guava/guava/31.1-jre/guava-31.1-jre.jar b/tools/lib/external/com/google/guava/guava/31.1-jre/guava-31.1-jre.jar
deleted file mode 100755
index 1681922..0000000
--- a/tools/lib/external/com/google/guava/guava/31.1-jre/guava-31.1-jre.jar
+++ /dev/null
diff --git a/tools/lib/external/com/google/guava/guava/32.0.1-jre/guava-32.0.1-jre.jar b/tools/lib/external/com/google/guava/guava/32.0.1-jre/guava-32.0.1-jre.jar
new file mode 100755
index 0000000..5f3a1ee
--- /dev/null
+++ b/tools/lib/external/com/google/guava/guava/32.0.1-jre/guava-32.0.1-jre.jar
diff --git a/tools/lib/external/com/google/j2objc/j2objc-annotations/1.3/j2objc-annotations-1.3.jar b/tools/lib/external/com/google/j2objc/j2objc-annotations/1.3/j2objc-annotations-1.3.jar
deleted file mode 100755
index a429c72..0000000
--- a/tools/lib/external/com/google/j2objc/j2objc-annotations/1.3/j2objc-annotations-1.3.jar
+++ /dev/null
diff --git a/tools/lib/external/com/google/j2objc/j2objc-annotations/2.8/j2objc-annotations-2.8.jar b/tools/lib/external/com/google/j2objc/j2objc-annotations/2.8/j2objc-annotations-2.8.jar
new file mode 100755
index 0000000..3595c4f
--- /dev/null
+++ b/tools/lib/external/com/google/j2objc/j2objc-annotations/2.8/j2objc-annotations-2.8.jar
diff --git a/tools/lib/external/com/google/protobuf/protobuf-java/3.19.3/protobuf-java-3.19.3.jar b/tools/lib/external/com/google/protobuf/protobuf-java/3.19.3/protobuf-java-3.19.3.jar
deleted file mode 100755
index e23484c..0000000
--- a/tools/lib/external/com/google/protobuf/protobuf-java/3.19.3/protobuf-java-3.19.3.jar
+++ /dev/null
diff --git a/tools/lib/external/com/google/protobuf/protobuf-java/3.22.3/protobuf-java-3.22.3.jar b/tools/lib/external/com/google/protobuf/protobuf-java/3.22.3/protobuf-java-3.22.3.jar
new file mode 100755
index 0000000..7685cda
--- /dev/null
+++ b/tools/lib/external/com/google/protobuf/protobuf-java/3.22.3/protobuf-java-3.22.3.jar
diff --git a/tools/lib/external/commons-io/commons-io/2.13.0/commons-io-2.13.0.jar b/tools/lib/external/commons-io/commons-io/2.13.0/commons-io-2.13.0.jar
new file mode 100755
index 0000000..eb316f4
--- /dev/null
+++ b/tools/lib/external/commons-io/commons-io/2.13.0/commons-io-2.13.0.jar
diff --git a/tools/lib/external/commons-io/commons-io/2.4/commons-io-2.4.jar b/tools/lib/external/commons-io/commons-io/2.4/commons-io-2.4.jar
deleted file mode 100755
index 90035a4..0000000
--- a/tools/lib/external/commons-io/commons-io/2.4/commons-io-2.4.jar
+++ /dev/null
diff --git a/tools/lib/external/lint-psi/kotlin-compiler/kotlin-compiler-mvn.jar b/tools/lib/external/lint-psi/kotlin-compiler/kotlin-compiler-mvn.jar
index ba19464..21b4415 100755
--- a/tools/lib/external/lint-psi/kotlin-compiler/kotlin-compiler-mvn.jar
+++ b/tools/lib/external/lint-psi/kotlin-compiler/kotlin-compiler-mvn.jar
diff --git a/tools/lib/external/lint-psi/uast/uast.jar b/tools/lib/external/lint-psi/uast/uast.jar
index 1f227dc..fd5f4ab 100755
--- a/tools/lib/external/lint-psi/uast/uast.jar
+++ b/tools/lib/external/lint-psi/uast/uast.jar
diff --git a/tools/lib/external/org/checkerframework/checker-qual/3.21.2/checker-qual-3.21.2.jar b/tools/lib/external/org/checkerframework/checker-qual/3.21.2/checker-qual-3.21.2.jar
deleted file mode 100755
index 517e470..0000000
--- a/tools/lib/external/org/checkerframework/checker-qual/3.21.2/checker-qual-3.21.2.jar
+++ /dev/null
diff --git a/tools/lib/external/org/checkerframework/checker-qual/3.33.0/checker-qual-3.33.0.jar b/tools/lib/external/org/checkerframework/checker-qual/3.33.0/checker-qual-3.33.0.jar
new file mode 100755
index 0000000..61761fd
--- /dev/null
+++ b/tools/lib/external/org/checkerframework/checker-qual/3.33.0/checker-qual-3.33.0.jar
diff --git a/tools/lib/external/org/jetbrains/annotations/13.0/annotations-13.0.jar b/tools/lib/external/org/jetbrains/annotations/13.0/annotations-13.0.jar
deleted file mode 100755
index fb794be..0000000
--- a/tools/lib/external/org/jetbrains/annotations/13.0/annotations-13.0.jar
+++ /dev/null
diff --git a/tools/lib/external/org/jetbrains/annotations/23.0.0/annotations-23.0.0.jar b/tools/lib/external/org/jetbrains/annotations/23.0.0/annotations-23.0.0.jar
new file mode 100755
index 0000000..5119f5e
--- /dev/null
+++ b/tools/lib/external/org/jetbrains/annotations/23.0.0/annotations-23.0.0.jar
diff --git a/tools/lib/external/org/jetbrains/kotlin/kotlin-reflect/1.9.20-Beta/kotlin-reflect-1.9.20-Beta.jar b/tools/lib/external/org/jetbrains/kotlin/kotlin-reflect/1.9.20-RC/kotlin-reflect-1.9.20-RC.jar
index ff2f5ca..b847482 100755
--- a/tools/lib/external/org/jetbrains/kotlin/kotlin-reflect/1.9.20-Beta/kotlin-reflect-1.9.20-Beta.jar
+++ b/tools/lib/external/org/jetbrains/kotlin/kotlin-reflect/1.9.20-RC/kotlin-reflect-1.9.20-RC.jar
diff --git a/tools/lib/external/org/jetbrains/kotlin/kotlin-stdlib-common/1.9.20-Beta/kotlin-stdlib-common-1.9.20-Beta.jar b/tools/lib/external/org/jetbrains/kotlin/kotlin-stdlib-common/1.9.20-RC/kotlin-stdlib-common-1.9.20-RC.jar
index 939d8a6..1e37345 100755
--- a/tools/lib/external/org/jetbrains/kotlin/kotlin-stdlib-common/1.9.20-Beta/kotlin-stdlib-common-1.9.20-Beta.jar
+++ b/tools/lib/external/org/jetbrains/kotlin/kotlin-stdlib-common/1.9.20-RC/kotlin-stdlib-common-1.9.20-RC.jar
diff --git a/tools/lib/external/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.9.20-Beta/kotlin-stdlib-jdk7-1.9.20-Beta.jar b/tools/lib/external/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.9.20-Beta/kotlin-stdlib-jdk7-1.9.20-Beta.jar
deleted file mode 100755
index 9e88d1f..0000000
--- a/tools/lib/external/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.9.20-Beta/kotlin-stdlib-jdk7-1.9.20-Beta.jar
+++ /dev/null
diff --git a/tools/lib/external/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.9.20-RC/kotlin-stdlib-jdk7-1.9.20-RC.jar b/tools/lib/external/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.9.20-RC/kotlin-stdlib-jdk7-1.9.20-RC.jar
new file mode 100755
index 0000000..7b2ded8
--- /dev/null
+++ b/tools/lib/external/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.9.20-RC/kotlin-stdlib-jdk7-1.9.20-RC.jar
diff --git a/tools/lib/external/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.9.20-Beta/kotlin-stdlib-jdk8-1.9.20-Beta.jar b/tools/lib/external/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.9.20-Beta/kotlin-stdlib-jdk8-1.9.20-Beta.jar
deleted file mode 100755
index 15ac978..0000000
--- a/tools/lib/external/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.9.20-Beta/kotlin-stdlib-jdk8-1.9.20-Beta.jar
+++ /dev/null
diff --git a/tools/lib/external/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.9.20-RC/kotlin-stdlib-jdk8-1.9.20-RC.jar b/tools/lib/external/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.9.20-RC/kotlin-stdlib-jdk8-1.9.20-RC.jar
new file mode 100755
index 0000000..d7b7d44
--- /dev/null
+++ b/tools/lib/external/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.9.20-RC/kotlin-stdlib-jdk8-1.9.20-RC.jar
diff --git a/tools/lib/external/org/jetbrains/kotlin/kotlin-stdlib/1.9.20-Beta/kotlin-stdlib-1.9.20-Beta.jar b/tools/lib/external/org/jetbrains/kotlin/kotlin-stdlib/1.9.20-RC/kotlin-stdlib-1.9.20-RC.jar
index 6998b00..ff571ea 100755
--- a/tools/lib/external/org/jetbrains/kotlin/kotlin-stdlib/1.9.20-Beta/kotlin-stdlib-1.9.20-Beta.jar
+++ b/tools/lib/external/org/jetbrains/kotlin/kotlin-stdlib/1.9.20-RC/kotlin-stdlib-1.9.20-RC.jar
diff --git a/tools/lib/external/org/ow2/asm/asm-analysis/9.3/asm-analysis-9.3.jar b/tools/lib/external/org/ow2/asm/asm-analysis/9.3/asm-analysis-9.3.jar
deleted file mode 100755
index 6bbfb05..0000000
--- a/tools/lib/external/org/ow2/asm/asm-analysis/9.3/asm-analysis-9.3.jar
+++ /dev/null
diff --git a/tools/lib/external/org/ow2/asm/asm-analysis/9.6/asm-analysis-9.6.jar b/tools/lib/external/org/ow2/asm/asm-analysis/9.6/asm-analysis-9.6.jar
new file mode 100755
index 0000000..f4e8691
--- /dev/null
+++ b/tools/lib/external/org/ow2/asm/asm-analysis/9.6/asm-analysis-9.6.jar
diff --git a/tools/lib/external/org/ow2/asm/asm-tree/9.3/asm-tree-9.3.jar b/tools/lib/external/org/ow2/asm/asm-tree/9.3/asm-tree-9.3.jar
deleted file mode 100755
index 55ef2a9..0000000
--- a/tools/lib/external/org/ow2/asm/asm-tree/9.3/asm-tree-9.3.jar
+++ /dev/null
diff --git a/tools/lib/external/org/ow2/asm/asm-tree/9.6/asm-tree-9.6.jar b/tools/lib/external/org/ow2/asm/asm-tree/9.6/asm-tree-9.6.jar
new file mode 100755
index 0000000..9fe5275
--- /dev/null
+++ b/tools/lib/external/org/ow2/asm/asm-tree/9.6/asm-tree-9.6.jar
diff --git a/tools/lib/external/org/ow2/asm/asm/9.3/asm-9.3.jar b/tools/lib/external/org/ow2/asm/asm/9.3/asm-9.3.jar
deleted file mode 100755
index bd8b948..0000000
--- a/tools/lib/external/org/ow2/asm/asm/9.3/asm-9.3.jar
+++ /dev/null
diff --git a/tools/lib/external/org/ow2/asm/asm/9.6/asm-9.6.jar b/tools/lib/external/org/ow2/asm/asm/9.6/asm-9.6.jar
new file mode 100755
index 0000000..cc1c2cd
--- /dev/null
+++ b/tools/lib/external/org/ow2/asm/asm/9.6/asm-9.6.jar
diff --git a/tools/lib/external/xerces/xercesImpl/2.12.0/xercesImpl-2.12.0.jar b/tools/lib/external/xerces/xercesImpl/2.12.0/xercesImpl-2.12.0.jar
deleted file mode 100755
index b69d01d..0000000
--- a/tools/lib/external/xerces/xercesImpl/2.12.0/xercesImpl-2.12.0.jar
+++ /dev/null
diff --git a/tools/lib/external/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01.jar b/tools/lib/external/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01.jar
deleted file mode 100755
index 4673346..0000000
--- a/tools/lib/external/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01.jar
+++ /dev/null
diff --git a/tools/lib/layoutlib-api/tools.layoutlib-api.jar b/tools/lib/layoutlib-api/tools.layoutlib-api.jar
index ce978d2..a7ff9f6 100755
--- a/tools/lib/layoutlib-api/tools.layoutlib-api.jar
+++ b/tools/lib/layoutlib-api/tools.layoutlib-api.jar
diff --git a/tools/lib/lint-classpath.jar b/tools/lib/lint-classpath.jar
index 2c87fb8..64149c0 100755
--- a/tools/lib/lint-classpath.jar
+++ b/tools/lib/lint-classpath.jar
diff --git a/tools/lib/lint/cli/cli.jar b/tools/lib/lint/cli/cli.jar
index d168a38..af3955b 100755
--- a/tools/lib/lint/cli/cli.jar
+++ b/tools/lib/lint/cli/cli.jar
diff --git a/tools/lib/lint/lint-checks-proto.jar b/tools/lib/lint/lint-checks-proto.jar
index cd678b1..219e1a4 100755
--- a/tools/lib/lint/lint-checks-proto.jar
+++ b/tools/lib/lint/lint-checks-proto.jar
diff --git a/tools/lib/lint/tools.lint-api.jar b/tools/lib/lint/tools.lint-api.jar
index 9762fc9..123073e 100755
--- a/tools/lib/lint/tools.lint-api.jar
+++ b/tools/lib/lint/tools.lint-api.jar
diff --git a/tools/lib/lint/tools.lint-checks.jar b/tools/lib/lint/tools.lint-checks.jar
index 39a9cd1..806fed3 100755
--- a/tools/lib/lint/tools.lint-checks.jar
+++ b/tools/lib/lint/tools.lint-checks.jar
diff --git a/tools/lib/lint/tools.lint-model.jar b/tools/lib/lint/tools.lint-model.jar
index e5252ae..86649ca 100755
--- a/tools/lib/lint/tools.lint-model.jar
+++ b/tools/lib/lint/tools.lint-model.jar
diff --git a/tools/lib/profgen-classpath.jar b/tools/lib/profgen-classpath.jar
index 88c6f5a..168ecc2 100755
--- a/tools/lib/profgen-classpath.jar
+++ b/tools/lib/profgen-classpath.jar
diff --git a/tools/lib/profgen/profgen-cli/libprofgen-cli-lib.jar b/tools/lib/profgen/profgen-cli/libprofgen-cli-lib.jar
index bb2db0a..a23d384 100755
--- a/tools/lib/profgen/profgen-cli/libprofgen-cli-lib.jar
+++ b/tools/lib/profgen/profgen-cli/libprofgen-cli-lib.jar
diff --git a/tools/lib/profgen/profgen/libprofgen.jar b/tools/lib/profgen/profgen/libprofgen.jar
index eb4efc7..00dc6f0 100755
--- a/tools/lib/profgen/profgen/libprofgen.jar
+++ b/tools/lib/profgen/profgen/libprofgen.jar
diff --git a/tools/lib/r8.jar b/tools/lib/r8.jar
index c5a65fa..701df44 100755
--- a/tools/lib/r8.jar
+++ b/tools/lib/r8.jar
diff --git a/tools/lib/repository/tools.repository.jar b/tools/lib/repository/tools.repository.jar
index 239c0da..030f2fe 100755
--- a/tools/lib/repository/tools.repository.jar
+++ b/tools/lib/repository/tools.repository.jar
diff --git a/tools/lib/resourceshrinker-classpath.jar b/tools/lib/resourceshrinker-classpath.jar
index 329c35d..c301e56 100755
--- a/tools/lib/resourceshrinker-classpath.jar
+++ b/tools/lib/resourceshrinker-classpath.jar
diff --git a/tools/lib/retrace-classpath.jar b/tools/lib/retrace-classpath.jar
index 9cfed6f..86c0c40 100755
--- a/tools/lib/retrace-classpath.jar
+++ b/tools/lib/retrace-classpath.jar
diff --git a/tools/lib/screenshot2-classpath.jar b/tools/lib/screenshot2-classpath.jar
index e301d88..8a53a85 100755
--- a/tools/lib/screenshot2-classpath.jar
+++ b/tools/lib/screenshot2-classpath.jar
diff --git a/tools/lib/sdk-common/tools.sdk-common.jar b/tools/lib/sdk-common/tools.sdk-common.jar
index 191edfe..9fc1993 100755
--- a/tools/lib/sdk-common/tools.sdk-common.jar
+++ b/tools/lib/sdk-common/tools.sdk-common.jar
diff --git a/tools/lib/sdklib/libavdmanager_lib.jar b/tools/lib/sdklib/libavdmanager_lib.jar
index 79a7515..0d278a3 100755
--- a/tools/lib/sdklib/libavdmanager_lib.jar
+++ b/tools/lib/sdklib/libavdmanager_lib.jar
diff --git a/tools/lib/sdklib/libsdkmanager_lib.jar b/tools/lib/sdklib/libsdkmanager_lib.jar
index 2a3ef2c..8d6551e 100755
--- a/tools/lib/sdklib/libsdkmanager_lib.jar
+++ b/tools/lib/sdklib/libsdkmanager_lib.jar
diff --git a/tools/lib/sdklib/sdklib.core.jar b/tools/lib/sdklib/sdklib.core.jar
index 88823d8..413b19c 100755
--- a/tools/lib/sdklib/sdklib.core.jar
+++ b/tools/lib/sdklib/sdklib.core.jar
diff --git a/tools/lib/sdklib/tools.sdklib.jar b/tools/lib/sdklib/tools.sdklib.jar
index 52db6d0..b46ca95 100755
--- a/tools/lib/sdklib/tools.sdklib.jar
+++ b/tools/lib/sdklib/tools.sdklib.jar
diff --git a/tools/lib/sdkmanager-classpath.jar b/tools/lib/sdkmanager-classpath.jar
index 6460cb4..e8bafa9 100755
--- a/tools/lib/sdkmanager-classpath.jar
+++ b/tools/lib/sdkmanager-classpath.jar
diff --git a/tools/source.properties b/tools/source.properties
index 6c91580..2604485 100755
--- a/tools/source.properties
+++ b/tools/source.properties
@@ -1,3 +1,3 @@
-Pkg.Revision=13.0-alpha06
-Pkg.Path=cmdline-tools;13.0-alpha06
+Pkg.Revision=13.0-alpha18
+Pkg.Path=cmdline-tools;13.0-alpha18
 Pkg.Desc=Android SDK Command-line Tools