Add the latest xen-gnt fixes for vchan demand-mapping