Merge "enable aapt for unbundled builds"