audio: Misc cleanups after merge

Change-Id: Idcd25798fe16fdfbb47d9c4e1822d93fd96e07c6