Merge "Fix file descriptor leakage in adbd"