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

Change-Id: I85db58062477eefc1cfc47d2fc9def56cb36a1b1