Merge "Use BUILD_HOST_STATIC_DALVIK_JAVA_LIBRARY for guava-hostdex"
am: ebb96ab162

Change-Id: I1231added43071a9b3bc608d7157714bad77fb32