Merge change Iddb7f466 into eclair

* changes:
  Put kxml back in adt-test