It rather doesn't matter. The X11 that Apple ships is effectively http://xquartz.macosforge.org/, so if they drop it (which I doubt), it's one short download away.
It also would surprise me if X11 weren't in the Mac App store when Lion ships or shortly afterwards.
For me, open questions are a) will that be an Apple product? and b) free or a couple of bucks?