am 97c6f43c: Merge "Change file to include sys/time.h directly."

* commit '97c6f43c51ac6efa2174fef523276494b9975011':
  Change file to include sys/time.h directly.