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

Change-Id: Ic4370c02cf1d83281ffadedd9c2e1006d3748cf1