Merge "Fix ADB daemon file descriptor leak"