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

* commit '2df0aac657e1287930ce1cf699328a0fe7deacb1':
  Fix file descriptor leakage in adbd