Merge "Upgrade expat to R_2_5_0"