Revert "Audio: minor tweaks"

This reverts commit bb263c44ac239264b10fc5c3ad9833599486701f.

Change-Id: I44c3fc9408f2a6520b6411fc9cec8e5be685e9ae