am ada18333: Merge change 8196 into donut

Merge commit 'ada18333257cdc14d3cafbddf5d1395574e5132b'

* commit 'ada18333257cdc14d3cafbddf5d1395574e5132b':
  Refactored AndroidXPathFactory into sdklib.