Merge "Upgrade to expat 2.2.5." am: 9204094d45 am: 61b40d53d7
am: 922ad2ac06

Change-Id: I89f875022eebadd42dcc06d23505f092de9719e9