[generic/3.2]: fixup arm xz support with recent changes