Merge "AbstractPlainSocketImpl#close shouldn't set fd to null"