Merge "Fix vold's use of readdir_r(3)."