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

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