Merge "More FileDescriptor.isSocket cleanup."