Merge "Migrate to AAPT2" into pi-dev