Merge "AAPT2: Insert platformBuild information" into pi-dev