Merge "audio: Fix compilation errors"