Merge "enable aapt for unbundled builds" am: c3270b85fb am: bd84bca4e1

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2006150

Change-Id: Iecbcf9eeea01ce03308c546cd804e06743154998