Merge "Use junit-host instead of junit"

am: 06c7276

Change-Id: Ie24435c4ee41174c00f5af3127d81779f47b8b5d

Author: paulduffin

tools/hosttestlib/Android.mk

@@ -21,7 +21,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
 LOCAL_MODULE := hosttestlib
 
-LOCAL_JAVA_LIBRARIES := ddmlib-prebuilt junit
+LOCAL_JAVA_LIBRARIES := ddmlib-prebuilt junit-host
 
 include $(BUILD_HOST_JAVA_LIBRARY)