Merge "hal: Update paths for dump and calib files"