Merge "Simplify makefile."
diff --git a/Android.mk b/Android.mk
index 6e07bc5..abe2580 100644
--- a/Android.mk
+++ b/Android.mk
@@ -56,8 +56,6 @@
 # on it
 LOCAL_SRC_FILES := $(call all-java-files-under, src/junit/extensions)
 LOCAL_SRC_FILES += $(core-junit-files)
-LOCAL_NO_STANDARD_LIBRARIES := true
-LOCAL_JAVA_LIBRARIES := core-hostdex
 LOCAL_JAVACFLAGS := $(local_javac_flags)
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := core-junit-hostdex