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