Merge branch 'upstream-elf' into import-elf

# By FreeBSD Upstream
* upstream-elf:
  elf 2021-06-23 (f13da247)