Snap for 4611397 from 22558c51ff8a9a9d8314a13febb665083bb5986a to pi-release

Change-Id: I0dbd3eec71dba4bb86bd386718f1199ac505bb3b
diff --git a/Android.mk b/Android.mk
index ea8495d..860b708 100644
--- a/Android.mk
+++ b/Android.mk
@@ -24,8 +24,7 @@
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := slf4j-jdk14
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-LOCAL_JAVA_LIBRARIES := core-oj core-libart
-LOCAL_NO_STANDARD_LIBRARIES := true
+LOCAL_SDK_VERSION := core_current
 include $(BUILD_STATIC_JAVA_LIBRARY)
 
 include $(CLEAR_VARS)