Merge "readdir_r is deprecated."
am: 9ace4848ae

Change-Id: If7ca268f3a9c68b70e180a360ee4bf303d4f6976