am f99dfdb5: Merge "vold: fix potential socket leak"

* commit 'f99dfdb5044ed6b120a8f2a86ddf2dd92a5bb9a2':
  vold: fix potential socket leak