Merge "Fix an artifact of going from off_t to off64_t"