Merge change 20833 into donut

* changes:
  BUG 1993354 : Add zipalign to SDK