Merge "enable aapt for unbundled builds" am: c3270b85fb

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

Change-Id: I0039b269359efb08090b5f7ae8cc5da77bcf6150