Merge "ScopedFd: Don't use TEMP_FAILURE_RETRY() with close()"