Merge "Use BUILD_HOST_STATIC_DALVIK_JAVA_LIBRARY for jsr305-hostdex"
am: 092d0433b4

Change-Id: I5622fa71afbceac29d96454625d142a0de45b7a2