Merge "AAPT2: Make sure to fail when XML linking fails" into oc-mr1-dev