Merge "ASoC: wcd9xxx: Fix the ANC CnP" into msm-4.9