am f611c1b5: Merge "Revert "Include build number in aapt version"" into lmp-dev

* commit 'f611c1b5d4fd6d6d1e46954a95760c2a0df3d264':
  Revert "Include build number in aapt version"