Merge "remove unused xdelta3/xz utilities"