Merge "Revert "Default to AAPT2 = false in AOSP only""