Merge "Fixup aapt usage message"
automerge: 64044d0

* commit '64044d0b7bc9aa46c60adcadce699d556e1c608e':
  Fixup aapt usage message