Merge "hal: fix compilation error"