fix kernel includes

Change-Id: I6f18663bf3b616c8738b11ee2eccfd4759f15599
Merge "fix kernel includes" into jellybean