Merge "kernel: Fix build errors with LLVM"