Merge change Id979947d

* changes:
  Remove org.kxml2.wap.