Revert "update build flags for CAF KK changes"

This reverts commit b722202a2c5d65aae23d78557d2507f2e5ef4b9e.