Merge "Fix the x86-64 int64_t/uint64_t."