Revert "Squashed commit of audio changes from CodeAurora"

This reverts commit 7ecbd752c29a9d54c8c983d3b178e719b1fd1e46.