Merge "Work around readdir_r warnings until we upstream a fix."
am: 18db0829f5

Change-Id: I6276c6fcd4228fdf32cd59874b27e19c0170552e