Updated build script as per latest core-common-lib changes