[libvirt] [PATCH 21/22] apibuild: Simplify merging of preproc tokens