nozomi: fix merge fail
cfx: add CPU_VARIANT flag