am 5d004211: (-s ours) am e92b9706: am 816fd074: (-s ours) am afa4d8bf: (-s ours) am 22d7cf23: Add single crunch command to aapt. do not merge.

* commit '5d00421157febf6e6be4e9abc0ac95549f5b9405':
  Add single crunch command to aapt. do not merge.