Merge "Upgrade to expat 2.1.1 am: c05e032be5 am: 095459e694 am: f660c7f877 am: 3b539e5853 am: 851ab139ae am: 2fdae36fc6 am: cdf19cb4b7 am: 161a47bda3 am: a926c8a162 am: 045eca42f0 am: 1461343f8a am: 29c78e9f18 am: bb6ac4891a" into nyc-mr1-dev-plus-aosp