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

* commit '9bbbac7560f544a6da2c3f49547c20f0c966597c':
  Change aapt flag to use new name