Merge changes Ib37508d4,Ia46ac30e

* changes:
  Turn off Windows builds during BUILD_HOST_static
  zipalign: Fix build failure in static_sdk_tools.