Merge "Add JarJar support to BUILD_HOST_JAVA_LIBRARY"