Merge "Fix the time unit tests for systems with 64-bit time_t."