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

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

Change-Id: I77148fda55942a07c075472979cdc508b983d0a5