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

Change-Id: Ic32bb2076e65d66fbba2c59f29f31d132b12fa0a