Fix kernel headers

Change-Id: I6d731f103df631bbb5ba6e6770ab124e2c599226
Merge "Fix kernel headers" into illusion-4.4