am ef47eb19: am 30136150: Merge "adb: avoid leaking file descriptors"

* commit 'ef47eb1948ba394866f53c41c459561fc372a3b5':
  adb: avoid leaking file descriptors