am d7147860: am 8affffc7: am ef284578: am 78d77bc3: (-s ours) am bbbdc2ad: am 5c90c4f4: Remove kxml dependency [DO NOT MERGE]

* commit 'd7147860693b6671bc8f39f3c96269ddac1491fa':
  Remove kxml dependency [DO NOT MERGE]