am a3827c4b: am 840f9d0a: Merge "Remove BUILD_HOST_JAVA_LIBRARY dependency on aapt"
am a3827c4b: am 840f9d0a: Merge "Remove BUILD_HOST_JAVA_LIBRARY dependency on aapt"

* commit 'a3827c4b6c1a4c5a1618515ccb8fc6692837ee71':
  Remove BUILD_HOST_JAVA_LIBRARY dependency on aapt

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build