Make the kernel incrementally buildable (again!)

Change-Id: Ia01656f9e9f43f0b8bc69d34e776e545ae0035a6
3 files changed