Merge "audio: qahw: Fix compilation errors"