Fix the module_combine tool in the presence of VariantDir