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

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