Merge "hal: Fix 64 bit compilation errors"