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

Change-Id: Ic7f859c538cce3050fd5f872d7ab6d351c6db2fb