Merge "Update time_t definition for 64-bit."