Merge "ASoC: codecs: move kcontrols out of codec driver structure" into msm-4.8