sound: Merge oppo changes

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

Change-Id: Ia46d456e237ed88ba09f21efdf8efe6e95406408