Revert "Fix build."

This reverts commit f2f6b7893d4051187a634e5bb3f1f4bea2fcb1f3.
Revert "Simplify code in XmlPullParserFactory."

This reverts commit 1a6d5164a054555c37ddf980a24d606ac3942f25.