am 575cf4dc: am 4c70244c: Make zipalign build for the Win SDK under Linux.

Merge commit '575cf4dc5e7d290858b1c11f4195694888a8164c' into kraken

* commit '575cf4dc5e7d290858b1c11f4195694888a8164c':
  Make zipalign build for the Win SDK under Linux.