Merge change 8196 into donut

* changes:
  Refactored AndroidXPathFactory into sdklib.