Merge "Move off deprecated readdir_r." am: 1647759651 am: b60d874f24
am: 984b786b0e

Change-Id: Ida8d9a0830cf660155d50e5179d9199717ee1720