Use AAPT2
am: cc08604e68

Change-Id: Ieca806cfc13e6f2dd754ec9d0202552ed0b28e7c