Merge "Add LOCAL_AAPT2_ONLY"