Merge "SocketImpl#getFileDescriptor shouldn't be public" into nyc-dev