Merge branch 'upstream-expat' into update-expat

# By Expat Upstream
* upstream-expat:
  expat 2022-01-30 (81b89678)