audio: revert some changes

Change-Id: I4271e89758693c643da19da06906d39d79a20e85