fixup vmin bypass properly
defconfig: restore OC/VC removed in error
update build flags for CAF KK changes