am 89482588: Merge change Iddb7f466 into eclair

Merge commit '894825887e9668872c1925704afcf3340b7c009b' into eclair-mr2

* commit '894825887e9668872c1925704afcf3340b7c009b':
  Put kxml back in adt-test