fuji-common: switch to cfx branch