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