Merge "Change file to include sys/time.h directly."