Revert "Shamu : Add Faux's Sound Control"

This reverts commit 48e00561d03e7cbd7e58a068f9eb4100b2dabc41.

Change-Id: Iff2dab79ad0321678dfdba79f4e0117b2a80bd30