Merge "Include build number in aapt version" into lmp-dev