Merge "Upgrade xercesImpl"