Merge "Use readdir instead of readdir_r." am: 833df5cd54
am: 16533c7c0b

Change-Id: I51c20b23b0c36500720073036c2667f866888351