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

Change-Id: Ib79b805eb4accec08523e03fcb98ee2f815bcbe2