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

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