[CLC-1224] Update-build script fixes
Merge pull request #632 from yuhunglin/CLC-1224

[CLC-1224] Update-build script fixes