am 17a4a0bd: am 9bbbac75: Merge "Change aapt flag to use new name"

* commit '17a4a0bd410f6133fd9088828f27e598ec9d268b':