Merge "Upgrade expat to R_2_2_9"
am: 20da7e1f04

Change-Id: I7153d1bc4616849557cb381f61e3aba48cd32d2f