Merge "Ignore deprecation warnings for readdir_r." am: c80fb7cc01
am: b113e967e9

Change-Id: I755d90d12203bbdbcd60f397b3a08fd33ad2eb85