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

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