Merge "ScopedFileDescriptor: better error on close"