Fix for building of kernel

Change-Id: I057ddbc122ac672a9c00b30e5385c986b1300e0b
bamf merge