Merge "Add LOCAL_AAPT2_ONLY" am: da5fbe3c38
am: 9b0a730b14

Change-Id: I0a198be6a96513edc6d09ce89050932ae24c3156