Merge "lito: Tune media_codecs XML files as per modified spec"