am 31a8ac22: BUG 1993354 : Add zipalign to Windows SDK

Merge commit '31a8ac22585b2a8263892487bd38b64783402e06'

* commit '31a8ac22585b2a8263892487bd38b64783402e06':
  BUG 1993354 : Add zipalign to Windows SDK