Merge branch 'upstream-expat' into update-expat

* upstream-expat:
  expat 2022-01-16 (57c7da69)