Merge "Work around readdir_r warnings until we upstream a fix."