Merge "Update media_codec_sw.xml"