[automerger skipped] Relax error handling in MediaCodecsXmlParser am: 4339a80b5a
am: 9f204e0c40  -s ours

Change-Id: I988240a3b8a79e05b9dda132da708a752b3790e4