Merge "ASoC: add missing switch mixer controls" into msm-4.9