Merge "Use int32_t instead of off_t when necessary."