Merge "Build with core_current" am: 9b65b98ff5 am: 252be30b42
am: cf9472443d

Change-Id: I12ec6bdb2005d3e7fed26029b1d412d23f76439a
diff --git a/Android.mk b/Android.mk
index 00b806f..42db122 100644
--- a/Android.mk
+++ b/Android.mk
@@ -18,8 +18,8 @@
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 LOCAL_JAVA_RESOURCE_DIRS := res
 LOCAL_MODULE := nist-pkix-tests
-LOCAL_JAVA_LIBRARIES := core-oj core-libart junit
-LOCAL_NO_STANDARD_LIBRARIES := true
+LOCAL_JAVA_LIBRARIES := junit
+LOCAL_SDK_VERSION := core_current
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 include $(BUILD_STATIC_JAVA_LIBRARY)