Update kernel

- Update kernel to latest mainline CAF tag
- Some other necessary changes