Merge "AAPT2: Be more strict parsing references"