Merge "Fix adb leaking file descriptors to forked processes"