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

Change-Id: Ia1ad45679602e1b05634e4befef35c29ac04498a