Merge "Update build scripts"