Merge "audio-hal: fix for compilation issues" into audio-hal.lnx.8.0