Merge "ASoC: msm: Changes for adding format widget" into msm-4.9