sound: Merge oppo changes

Conflicts:
	sound/soc/codecs/wcd9310.c
	sound/soc/msm/apq8064.c

Change-Id: I11b387f02e54cd8df5b08cb5fee9a18c1485f92a