Merge change 22697 into eclair

* changes:
  Ant clean target added