Revert "Revert a bunch of sound commits causing audio issues"

This reverts commit 242e254ea1d99be1066aaf27725210239877145f.

Change-Id: I1f827ba3edc05108f1d9c41cac403ec675a2255f