Merge branch 'binutils-llvm-ar-apple' into release-3.21

Merge-request: !7077