Merge change 21211 into donut

* changes:
  Make the Ant script sign and zipalign release builds.