diff --git a/Android.bp b/Android.bp
index 6fa9b5e..5ecfc20 100644
--- a/Android.bp
+++ b/Android.bp
@@ -78,7 +78,11 @@
 
     srcs: [":bouncycastle_java_files"],
 
-    no_framework_libs: true,
+    no_standard_libs: true,
+    libs: [
+        "core-all",
+    ],
+    system_modules: "core-all-system-modules",
     java_version: "1.7",
 }
 
@@ -92,7 +96,11 @@
 
     srcs: [":bouncycastle_java_files"],
 
-    no_framework_libs: true,
+    no_standard_libs: true,
+    libs: [
+        "core-all",
+    ],
+    system_modules: "core-all-system-modules",
     java_version: "1.7",
 }
 
@@ -104,9 +112,13 @@
 
     srcs: ["android_bcpkix/src/main/java/**/*.java"],
     exclude_srcs: ["android_bcpkix/src/main/java/org/bouncycastle/cert/ocsp/**/*.java"],
-    libs: ["bouncycastle"],
 
-    no_framework_libs: true,
+    no_standard_libs: true,
+    libs: [
+        "core-all",
+        "bouncycastle",
+    ],
+    system_modules: "core-all-system-modules",
     java_version: "1.7",
 }
 
@@ -136,7 +148,12 @@
         "android_bcprov/src/main/java/org/bouncycastle/asn1/ocsp/**/*.java",
     ],
 
-    no_framework_libs: true,
+    no_standard_libs: true,
+    libs: [
+        "core-all",
+        "bouncycastle",
+    ],
+    system_modules: "core-all-system-modules",
     java_version: "1.7",
 }