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

* commit '3013615077bbf1ccedaef59181f5e96062ad479a':
  adb: avoid leaking file descriptors