Revert "Squashed commit of audio changes from CodeAurora"

This reverts commit 9e5838a17a1564bdfea59dfac0f403c589f1eae7.