Merge "ASoC: msm8998: use right macro for wcd934x speaker config" into msm-4.8