Merge sound/soc/codecs with CM