Merge change 20426 into donut

* changes:
  Improve the comments in build.xml to help people customize their build.