Merge "We shouldn't have a <sys/dirent.h> that's a subset of <dirent.h>."