diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java
index e5eaba200f3b7a..81cb55e4bb093d 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java
@@ -689,14 +689,6 @@ removed from the APK. This is only supported for rules using local resources (i.
                   .cfg(ExecutionTransitionFactory.createFactory())
                   .exec()
                   .value(env.getToolsLabel("//tools/android:desugar_java8")))
-          .add(
-              attr("$java8_legacy_dex", LABEL)
-                  .value(env.getToolsLabel("//tools/android:java8_legacy_dex")))
-          .add(
-              attr("$build_java8_legacy_dex", LABEL)
-                  .cfg(ExecutionTransitionFactory.createFactory())
-                  .exec()
-                  .value(env.getToolsLabel("//tools/android:build_java8_legacy_dex")))
           .add(
               attr("$desugared_java8_legacy_apis", LABEL)
                   .value(env.getToolsLabel("//tools/android:desugared_java8_legacy_apis")))
diff --git a/src/test/java/com/google/devtools/build/android/dexer/BUILD b/src/test/java/com/google/devtools/build/android/dexer/BUILD
index 9a29e00b6e149f..ec9c9dbfb24dda 100644
--- a/src/test/java/com/google/devtools/build/android/dexer/BUILD
+++ b/src/test/java/com/google/devtools/build/android/dexer/BUILD
@@ -40,7 +40,7 @@ java_library(
         "//third_party:truth",
         "@bazel_tools//tools/java/runfiles",
     ] + select({
-        "//external:has_androidsdk": ["//external:android/dx_jar_import"],
+        # "//external:has_androidsdk": ["//external:android/dx_jar_import"],
         "//conditions:default": [],
     }),
 )
diff --git a/src/test/java/com/google/devtools/build/android/r8/BUILD b/src/test/java/com/google/devtools/build/android/r8/BUILD
index 701fcf9f66628d..9ba04280b29d6f 100644
--- a/src/test/java/com/google/devtools/build/android/r8/BUILD
+++ b/src/test/java/com/google/devtools/build/android/r8/BUILD
@@ -35,13 +35,9 @@ java_library(
         "//third_party:guava",
         "//third_party:junit4",
         "//third_party:truth",
+        "@android_gmaven_r8//jar",
         "@bazel_tools//tools/java/runfiles",
-    ] + select({
-        "//external:has_androidsdk": [
-            "//external:android/d8_jar_import",
-        ],
-        "//conditions:default": [],
-    }),
+    ],
 )
 
 java_test(
diff --git a/src/tools/android/java/com/google/devtools/build/android/dexer/BUILD b/src/tools/android/java/com/google/devtools/build/android/dexer/BUILD
index c570e14197ec7e..194818dbb1b08b 100644
--- a/src/tools/android/java/com/google/devtools/build/android/dexer/BUILD
+++ b/src/tools/android/java/com/google/devtools/build/android/dexer/BUILD
@@ -39,7 +39,7 @@ java_library(
         "//third_party:guava",
         "//third_party:jsr305",
     ] + select({
-        "//external:has_androidsdk": ["//external:android/dx_jar_import"],
+        # "//external:has_androidsdk": ["//external:android/dx_jar_import"],
         "//conditions:default": [],
     }),
 )
diff --git a/src/tools/android/java/com/google/devtools/build/android/dexer/BUILD.tools b/src/tools/android/java/com/google/devtools/build/android/dexer/BUILD.tools
index fd4dd56319a691..ec75538b499ac7 100644
--- a/src/tools/android/java/com/google/devtools/build/android/dexer/BUILD.tools
+++ b/src/tools/android/java/com/google/devtools/build/android/dexer/BUILD.tools
@@ -13,7 +13,7 @@ java_library(
    ),
     plugins = ["auto_value_plugin"],
     deps = [
-        "//external:android/dx_jar_import",
+        # "//external:android/dx_jar_import",
         "//src/tools/android/java/com/google/devtools/build/android:all_android_tools",
     ],
 )
diff --git a/src/tools/android/java/com/google/devtools/build/android/r8/BUILD b/src/tools/android/java/com/google/devtools/build/android/r8/BUILD
index c0701712c0f74f..361cb910e1e85b 100644
--- a/src/tools/android/java/com/google/devtools/build/android/r8/BUILD
+++ b/src/tools/android/java/com/google/devtools/build/android/r8/BUILD
@@ -51,10 +51,8 @@ java_library(
         "//third_party:auto_value",
         "//third_party:guava",
         "//third_party:jsr305",
-    ] + select({
-        "//external:has_androidsdk": ["//external:android/d8_jar_import"],
-        "//conditions:default": [],
-    }),
+        "@android_gmaven_r8//jar",
+    ],
 )
 
 java_library(
diff --git a/src/tools/android/java/com/google/devtools/build/android/r8/BUILD.tools b/src/tools/android/java/com/google/devtools/build/android/r8/BUILD.tools
index ac75c82a25d6c1..ab2b3249ddecbf 100644
--- a/src/tools/android/java/com/google/devtools/build/android/r8/BUILD.tools
+++ b/src/tools/android/java/com/google/devtools/build/android/r8/BUILD.tools
@@ -2,12 +2,15 @@ package(default_visibility = ["//visibility:public"])
 
 java_library(
     name = "r8",
-    srcs = glob(["*.java", "desugar/*.java"]),
+    srcs = glob([
+        "*.java",
+        "desugar/*.java",
+    ]),
+    plugins = ["auto_value_plugin"],
     deps = [
-        "//external:android/d8_jar_import",
         "//src/tools/android/java/com/google/devtools/build/android:all_android_tools",
+        "@android_gmaven_r8//jar",
     ],
-    plugins = ["auto_value_plugin"],
 )
 
 java_plugin(
diff --git a/tools/android/BUILD.tools b/tools/android/BUILD.tools
index 2b7310ee29569d..f940e9a218b5ba 100644
--- a/tools/android/BUILD.tools
+++ b/tools/android/BUILD.tools
@@ -6,10 +6,10 @@ package(default_visibility = ["//visibility:public"])
 # The toolchain type used to distinguish Android SDK toolchains.
 toolchain_type(name = "sdk_toolchain_type")
 
-alias(
-    name = "sdk",
-    actual = "//external:android/sdk",
-)
+# alias(
+#     name = "sdk",
+#     actual = "@androidsdk//:sdk",
+# )
 
 android_tools_defaults_jar(name = "android_jar")
 
@@ -80,8 +80,8 @@ config_setting(
 alias(
     name = "dexbuilder_after_proguard",
     actual = select({
-       ":dx_standalone_dexer": "//src/tools/android/java/com/google/devtools/build/android/dexer:DexBuilder",
-       "//conditions:default": ":d8_dexbuilder",
+        ":dx_standalone_dexer": "//src/tools/android/java/com/google/devtools/build/android/dexer:DexBuilder",
+        "//conditions:default": ":d8_dexbuilder",
     }),
 )
 
@@ -143,12 +143,18 @@ sh_binary(
         "d8_desugaring": ["d8_desugar.sh"],
         "//conditions:default": ["d8_desugar.sh"],
     }),
-    deps = ["@bazel_tools//tools/bash/runfiles"],
     data = select({
         "legacy_desugaring": ["//src/tools/android/java/com/google/devtools/build/android/desugar:Desugar"],
-        "d8_desugaring": ["@bazel_tools//src/tools/android/java/com/google/devtools/build/android/r8:desugar", "chm_only_desugar_jdk_libs.json"],
-        "//conditions:default": ["@bazel_tools//src/tools/android/java/com/google/devtools/build/android/r8:desugar", "chm_only_desugar_jdk_libs.json"],
-    })
+        "d8_desugaring": [
+            "chm_only_desugar_jdk_libs.json",
+            "@bazel_tools//src/tools/android/java/com/google/devtools/build/android/r8:desugar",
+        ],
+        "//conditions:default": [
+            "chm_only_desugar_jdk_libs.json",
+            "@bazel_tools//src/tools/android/java/com/google/devtools/build/android/r8:desugar",
+        ],
+    }),
+    deps = ["@bazel_tools//tools/bash/runfiles"],
 )
 
 alias(
@@ -204,7 +210,7 @@ sh_binary(
     data = [
         "minify_java8_legacy_libs.cfg",
         ":desugared_java8_legacy_libs",
-        ":dexer",
+        # ":dexer",
         "@bazel_tools//src/tools/android/java/com/google/devtools/build/android/desugar/scan:KeepScanner",
         "@bazel_tools//tools/jdk:proguard",
     ],
@@ -233,9 +239,12 @@ filegroup(
 
 genrule(
     name = "desugar_java8_legacy_libs",
-    srcs = ["@android_tools//:desugar_jdk_libs.jar", "full_desugar_jdk_libs.json", ":android_jar"],
+    srcs = [
+        "@android_tools//:desugar_jdk_libs.jar",
+        "full_desugar_jdk_libs.json",
+        ":android_jar",
+    ],
     outs = ["desugared_java8_legacy_libs.jar"],
-    message = "Desugaring java8 legacy libs with the D8 desugarer",
     cmd = (
         "$(location //src/tools/android/java/com/google/devtools/build/android/r8:core_library_desugar)" +
         " --input $(location @android_tools//:desugar_jdk_libs.jar)" +
@@ -244,6 +253,7 @@ genrule(
         " --desugar_supported_core_libs" +
         " --desugared_lib_config $(location full_desugar_jdk_libs.json)"
     ),
+    message = "Desugaring java8 legacy libs with the D8 desugarer",
     tools = ["//src/tools/android/java/com/google/devtools/build/android/r8:core_library_desugar"],
 )
 
@@ -255,12 +265,13 @@ exports_files(
 
 # Mirrors @<repo>//:dx_binary generated by android_sdk_repository rule without
 # needing the SDK repo's name (typically @androidsdk but not required).
-java_binary(
-    name = "dexer",
-    main_class = "com.android.dx.command.Main",
-    visibility = ["//visibility:private"],
-    runtime_deps = ["//external:android/dx_jar_import"],
-)
+
+# java_binary(
+#     name = "dexer",
+#     main_class = "com.android.dx.command.Main",
+#     visibility = ["//visibility:private"],
+#     runtime_deps = ["//external:android/dx_jar_import"],
+# )
 
 alias(
     name = "IdlClass",
@@ -315,9 +326,9 @@ py_binary(
     ],
     python_version = "PY3",
     deps = [
+        ":json_worker_wrapper",
         ":junction_lib",
         "//third_party/py/abseil",
-        ":json_worker_wrapper",
     ],
 )
 
@@ -335,9 +346,9 @@ py_binary(
     srcs = ["aar_embedded_proguard_extractor.py"],
     python_version = "PY3",
     deps = [
+        ":json_worker_wrapper",
         ":junction_lib",
         "//third_party/py/abseil",
-        ":json_worker_wrapper",
     ],
 )
 
@@ -346,9 +357,9 @@ py_binary(
     srcs = ["aar_embedded_jars_extractor.py"],
     python_version = "PY3",
     deps = [
+        ":json_worker_wrapper",
         ":junction_lib",
         "//third_party/py/abseil",
-        ":json_worker_wrapper",
     ],
 )
 
@@ -357,9 +368,9 @@ py_binary(
     srcs = ["aar_resources_extractor.py"],
     python_version = "PY3",
     deps = [
+        ":json_worker_wrapper",
         ":junction_lib",
         "//third_party/py/abseil",
-        ":json_worker_wrapper",
     ],
 )
 
@@ -380,8 +391,8 @@ py_library(
 py_library(
     name = "json_worker_wrapper",
     srcs = ["json_worker_wrapper.py"],
-    visibility = ["//visibility:private"],
     srcs_version = "PY3",
+    visibility = ["//visibility:private"],
 )
 
 alias(