Merge "ASoC: wcd934x: Fix mbhc errors upon removing SND_SOC_WCD934X_MBHC" into msm-4.9