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

* commit '5d09126ad1cd10c74e676fb158f1d057a37180b2':
  vold: fix potential socket leak