Updated build script
Synced from master
Synced from master