Merge "SocketImpl#getFileDescriptor shouldn't be public"