Merge "hal: Fix compilation error"