Update the cctools patches, some bits were missing.
WIP, patching succeeds