Merge "adb: avoid leaking file descriptors"