am 427964ed: Merge "Include build number in aapt version" into lmp-dev

* commit '427964ed3c2647dcd5669ce77ec387bf71ba13f0':
  Include build number in aapt version