Merge "Add xz option to use more threads"