Merge "Upgrade expat to R_2_4_9"