diff --git a/Android.bp b/Android.bp
index 7cefad1..db6d520 100644
--- a/Android.bp
+++ b/Android.bp
@@ -18,8 +18,8 @@
     name: "rappor",
     no_framework_libs: true,
     java_version: "1.7",
+    sdk_version: "core_current",
     libs: [
-        "core-oj",
         "jsr305",
     ],
     srcs: ["client/java/**/*.java"],
diff --git a/Android.mk b/Android.mk
index 948d2f5..1fb2caf 100644
--- a/Android.mk
+++ b/Android.mk
@@ -17,9 +17,9 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE := rappor-tests
-LOCAL_NO_STANDARD_LIBRARIES := true
 LOCAL_JAVA_LANGUAGE_VERSION := 1.7
 LOCAL_STATIC_JAVA_LIBRARIES := hamcrest-library rappor guava junit
-LOCAL_JAVA_LIBRARIES := core-oj jsr305
+LOCAL_JAVA_LIBRARIES := jsr305
+LOCAL_SDK_VERISON := core_current
 LOCAL_SRC_FILES := $(call all-java-files-under, client/javatest)
 include $(BUILD_STATIC_JAVA_LIBRARY)