Merge "Remove BUILD_HOST_JAVA_LIBRARY dependency on aapt"