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

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