Merge "hal: Fix setting stream channel map properly"