fixup arm xz support with recent changes