merge most recent version of faux sound codec

Conflicts:
	sound/soc/codecs/sound_control_gpl.c