Merge "Use BUILD_HOST_STATIC_DALVIK_JAVA_LIBRARY for junit-hostdex" am:...

Merge "Use BUILD_HOST_STATIC_DALVIK_JAVA_LIBRARY for junit-hostdex" am: 9dd4dbb0 am: 2933ae21 am: c1600bcf
am: 83b9cd93

Change-Id: I70e474d9a96a7ac0a8d0d7e221b60c003414d624

Android.mk

@@ -50,7 +50,7 @@ LOCAL_MODULE := junit-hostdex
 LOCAL_MODULE_TAGS := tests
 LOCAL_STATIC_JAVA_LIBRARIES := hamcrest-hostdex
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-include $(BUILD_HOST_DALVIK_JAVA_LIBRARY)
+include $(BUILD_HOST_DALVIK_STATIC_JAVA_LIBRARY)
 endif # HOST_OS == linux
 
 #-------------------------------------------------------