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

Change-Id: Ie179f83c8cd281cdfb1e4fc4b4f1d1dfb29159f8