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

Change-Id: Ie7de2a969ff5424bd28e3a5ce783266c2ec63bd0