Bundle both expat & xml2, don't disable xml2