Merge "Migrate to AAPT2" into pi-dev
am: 341d6a1589

Change-Id: I8118e901392006fc4dc8de9977ddd57c620180f3