Merge "hal: Fix audio hal a2dp issues"