Merge "enable aapt for unbundled builds" am: c3270b85fb am: bd84bca4e1 am: 4bbbeefb86 am: e2d43ee89e am: 00972ef356
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2006150 Change-Id: I6182c2d376355876bcea673e8c351acc11a1a94d
This commit is contained in: