Merge "hal: fix compilation error after disabling Dolby"