am edf4e179: Merge "Fix vold\'s use of readdir_r(3)."

* commit 'edf4e17940c6d3887e9009b23ffca5be8116fbe9':
  Fix vold's use of readdir_r(3).