Changes for build script simplification.
Update custom build scripts.