am c04a21a0: Merge "Fixup aapt usage message" automerge: 64044d0
automerge: 6e2eb2d

* commit '6e2eb2df4cb8ca4d0eeda0fb38e1a67136a0d275':
  Fixup aapt usage message