build: Switch to using the new subtree version of CFD.