[automerger skipped] AAPT2: Better error messages for ManifestFixer am: b2b20f26 am: 6671fe5c -s ours am: 04fe1bd0 -s ours Change-Id: Iaa2d79b697246497c5e694ae44138be6c3b34730