Merge "RpcServer: expose server fd"