Merge "Update deps for rmtypedefs and mkstubs." am: 99a9d7be5e am: d480253149

Original change: https://android-review.googlesource.com/c/platform/development/+/2287993

Change-Id: Iabbecbfa369f601617b85b4ed7441d2cb0371f8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

tools/mkstubs/Android.bp

@@ -22,5 +22,5 @@ java_library_host {
     name: "mkstubs",
     srcs: ["src/**/*.java"],
     manifest: "manifest.txt",
-    static_libs: ["asm-5.2"],
+    static_libs: ["asm-9.2"],
 }

tools/rmtypedefs/Android.bp

@@ -22,7 +22,7 @@ java_binary_host {
     manifest: "etc/manifest.txt",
     wrapper: "etc/rmtypedefs",
     static_libs: [
-        "asm-5.2",
-        "guava-21.0",
+        "asm-9.2",
+        "guava",
     ],
 }