Merge "Remove bogus dependency on <sys/utime.h>."