[automerger skipped] AAPT2: Better error messages for ManifestFixer am: b2b20f26db
am: 6671fe5c8e  -s ours

Change-Id: Ibf21d14fd06c84ec2bcf92e58b8e4c95659cf333