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

Change-Id: I517c67deb0ff958dc6f085efb8e0aeca06f6b296