Merge "Add override variable for LIBVIRT_TYPE"