merge sound/soc/msm/ from d2 cm official