Merge "Adjust build script for portability"