Merge "hal: fix incompatible APIs"