diff --git a/java/core-libraries/Android.bp b/java/core-libraries/Android.bp
index 8c808e4..da86540 100644
--- a/java/core-libraries/Android.bp
+++ b/java/core-libraries/Android.bp
@@ -132,10 +132,10 @@
 // prebuilts/sdk/update_prebuilts.py script to update the prebuilts/sdk
 // directory.
 java_library {
-    name: "core-current-stubs-for-system-modules-exportable",
+    name: "core-current-stubs-for-system-modules",
     visibility: ["//development/sdk"],
     static_libs: [
-        "core.current.stubs.exportable",
+        "core.current.stubs",
         // This one is not on device but it's needed when javac compiles code
         // containing lambdas.
         "core-lambda-stubs-for-system-modules",
@@ -155,19 +155,6 @@
     ],
 }
 
-java_library {
-    name: "core-current-stubs-for-system-modules",
-    visibility: ["//development/sdk"],
-    static_libs: [
-        "core.current.stubs",
-        // This one is not on device but it's needed when javac compiles code
-        // containing lambdas.
-        "core-lambda-stubs-for-system-modules",
-    ],
-    sdk_version: "none",
-    system_modules: "none",
-}
-
 // Defaults module to strip out android annotations
 java_defaults {
     name: "system-modules-no-annotations",