Merge "Default to AAPT2 = false in AOSP only"
am: 6146e28628

Change-Id: I15ce6a49f40ebf190c021b60a3e1abff31bc0a9c