Merge "hal: Update paths for calib files"