Update CMake subtree to fix bootstrapped Buildyard build