audio: Fix merge issues

Change-Id: If72942b042ab1cebd1788644954fd13eee028e49