Merge "Upgrade to expat 2.1.0."