Merge "Use art module intra code API instead of core-all"
diff --git a/Android.bp b/Android.bp
index 3822e15..4b06243 100644
--- a/Android.bp
+++ b/Android.bp
@@ -73,7 +73,7 @@
     srcs: [":bouncycastle_java_files"],
 
     sdk_version: "none",
-    system_modules: "core-all-system-modules",
+    system_modules: "art-module-intra-core-api-stubs-system-modules",
 }
 
 // A guaranteed unstripped version of bouncycastle.
@@ -90,7 +90,7 @@
     srcs: [":bouncycastle_java_files"],
 
     sdk_version: "none",
-    system_modules: "core-all-system-modules",
+    system_modules: "art-module-intra-core-api-stubs-system-modules",
     dex_preopt: {
         enabled: false,
     },