am 19aa5add: am 2df0aac6: Merge "Fix file descriptor leakage in adbd"

* commit '19aa5addcfea0efafca1562e5fef51f8d00195ad':
  Fix file descriptor leakage in adbd