Merge "Use BUILD_HOST_STATIC_DALVIK_JAVA_LIBRARY for junit-hostdex" am: 9dd4dbb077 am: 2933ae2128
am: c1600bcfba

Change-Id: Ib54435dcc6a415f2e4e8438b4e4fe8365cf66361