Revert the bogus half of the previous commit (which added COMPHOLIO
to OPTIONS_DEFAULT).

The other half, which is actually desirable, moved extraction of
the Compholio/Staging patchset from the pre-configure target to
the post-extract target which allows us to actually add local
patches for this patchset as well.