Merge "Relax error handling in MediaCodecsXmlParser"