Revert "Squashed commit of audio changes from CodeAurora"

This reverts commit bf29f7530219da288c5cd12f6694a2ccb12ed25b.