Merge "Allow compiling aapt for the device"