[automerger skipped] Merge "Revert "Default to AAPT2 = false in AOSP only"" am: 035c5a35a6
am: 09db0149a0  -s ours

Change-Id: I66209abfe3fa4984473c5f09a52e472f6fe47978