am 2a9b85d7: am c0f17383: Merge "Move kxml2 to prebuilts/misc"

* commit '2a9b85d7ccdd3b8e6be90454cdcb4be3b032cd64':
  Move kxml2 to prebuilts/misc