ASoC: msm8974: cleanup Oppo merge

Change-Id: I6e1c2c2990a049836264ca68f6317fb5720132b9
3.4.0 -> 3.4.98

 Linux 3.4.98 - squashed commit

Change-Id: Ia4752cf0579ecd45b07d2d72e98ebc1ebe308a19
Linux 3.4.92 - squashed commit

Change-Id: Ib2b2093c56330e24b089e4401dbb4d6f3b0c8081