Merge "hal: Compilation fix"