Merge "AAPT2: Better error messages for ManifestFixer"