Revert "Sound: Cleanup after reverts"

This reverts commit 7093edca47b16aae867a9a99cd98354130632e1e.
Revert "Revert "Revert "Revert a bunch of sound commits causing audio issues"""

This reverts commit 33ae2b0ba8b9a00394c8a22cfcb2aa513333ba6c.

Conflicts:
	sound/soc/codecs/Makefile
	sound/soc/codecs/sound_control_3_gpl.c
furnace 1.6.1