Merge "Fixup aapt usage message"