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

Change-Id: I690237a7aac1ba838d4a824179be1288b3e1aad4