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

Change-Id: I1cd7b4264b7aaec8deccf4f05614cc817e7da0a6