Merge "hal: Code clean up for audio extension" into av-userspace.lnx.2.0-dev