Update tools for tooling-cmake-util change