Merge branch 'backport-update-libarchive' into update-libarchive

Use the "ours" merge strategy to keep our side, which is already
a newer version of libarchive than the update we're backporting
to the 3.22 and 3.23 series.