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

* commit 'c04a21a0ef6cd97a45307e4c1de9088e57719ca2':
  Fixup aapt usage message