Merge "Fix mac build: include <sys/time.h> in time_utils.cc ."