Merge "ASoC: msm: Use CONFIG_SND_SOC_660 to compile machine driver"