Merge "Fix build-*llvm.sh to build either mclinker 2.4.0 or the coming 2.5.0"