nicki: merge caf kernel into stock kernel