Merge "Add JarJar support to BUILD_HOST_JAVA_LIBRARY"
am: b97ce3bb61

* commit 'b97ce3bb613c1ea18c9aea42e829ac34039b7679':
  Add JarJar support to BUILD_HOST_JAVA_LIBRARY