swift

[swift-3.0-preview-2-branch] build-script fixes

#3234

Merged