Merge "ASoC: msm8226: Cleanup machine driver"