am bb9f3f74: am 7174719f: Merge "Upgrade to expat 2.1.0."

* commit 'bb9f3f74212ef523ff693cba9d782575ebba7418':
  Upgrade to expat 2.1.0.