Merge "ASoC: wcd9xxx: Fix codec regulator override" into msm-4.9