Merge "readdir_r is deprecated." am: 9ace4848ae
am: 15f5c001ae

Change-Id: I19fca038d07c442ee2c77740fb6075e5eb49bf24