Merge "hal: Fix compilation errors" into audio-hal.lnx.5.1