Merge change I3788a1e3 into eclair-mr2

* changes:
  Remove XPathNSResolver from the Android build.