am 5d5cc227: Merge "We shouldn\'t have a <sys/dirent.h> that\'s a subset of <dirent.h>."

* commit '5d5cc2273f7be6b3d9fe4e5787ab22bc137c811a':
  We shouldn't have a <sys/dirent.h> that's a subset of <dirent.h>.