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

Change-Id: I931b7642976acdab7003acfd837982d613dd8110