tools/xz: add some upstream patches