Merge "Use uint32_t instead of int to support 2~4G file"