Merge "MediaCodecsXmlParser: append variants instead of replacing" into main