Merge "hal: handle CLANG errors for Dolby"