Merge "AAPT2: Insert platformBuild information" into pi-dev
am: 91d2f87d0e

Change-Id: Ifa673f17cb3ee1ecb146aaafab7c3c71b47f7154