Merge change 21617 into donut

* changes:
  ADT Export wizard now calls ZipAlign