diff --git a/StubLibraries.bp b/StubLibraries.bp
index d0da5da..00d0771 100644
--- a/StubLibraries.bp
+++ b/StubLibraries.bp
@@ -392,16 +392,6 @@
 }
 
 java_defaults {
-    name: "android_defaults_stubs_current",
-    sdk_version: "none",
-    system_modules: "none",
-    java_version: "1.8",
-    compile_dex: true,
-    defaults_visibility: ["//visibility:private"],
-    visibility: ["//visibility:public"],
-}
-
-java_defaults {
     name: "android_stubs_dists_default",
     dist: {
         targets: [
@@ -420,7 +410,7 @@
         "android-non-updatable.stubs",
         "private-stub-annotations-jar",
     ],
-    defaults: ["android_defaults_stubs_current"],
+    defaults: ["android.jar_defaults"],
 }
 
 java_library_static {
@@ -430,7 +420,7 @@
         "private-stub-annotations-jar",
     ],
     defaults: [
-        "android_defaults_stubs_current",
+        "android.jar_defaults",
         "android_stubs_dists_default",
     ],
     dist: {
@@ -458,7 +448,7 @@
         "private-stub-annotations-jar",
     ],
     defaults: [
-        "android_defaults_stubs_current",
+        "android.jar_defaults",
         "android_stubs_dists_default",
     ],
     dist: {
@@ -469,7 +459,7 @@
 java_library_static {
     name: "android_module_lib_stubs_current",
     defaults: [
-        "android_defaults_stubs_current",
+        "android.jar_defaults",
         "android_stubs_dists_default",
     ],
     static_libs: [