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

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