Merge "audio: fix misc static errors"