Merge "hal: Fix improper aac encoder config for split a2dp" into audio-userspace.lnx.2.1-dev