Fix broken backport imports for vendored vistir.