Merge "Make zipalign build for the Win SDK under Linux."