Use AAPT2
am: f5cc075f37

Change-Id: Ieff51c5e1c90b43a011b0163251bf2c755991a2e