[automerger skipped] Merge "Default to AAPT2 = false in AOSP only" am: 6146e28628
am: 5eca469669  -s ours

Change-Id: I328a1f5f457b55b77e941536daaaef77e40ef6ff