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

Change-Id: Iba9110f7b945278248320f17f9b5facc34aad0ee