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

Change-Id: I6ae0efe633ec257739a6af81a7cc19081e910ea3