Log Message:
mesalib18: the previous commit was actually about the combination of
-dri +osmesa. the dri case wasn't broken and already had expat.
expat is an easy dependency, and the default case will need it (and will
have it for various xorg things), so let's just keep it unconditional
and remove the conditional expat.