Merge "Fix compatibility issues in XmlPullParserFactory."