ASoC: msm8974: cleanup Oppo merge

Change-Id: I6e1c2c2990a049836264ca68f6317fb5720132b9
Merge branch 'cm-11.0' into kk_mkt