Now our kernel can be compiled with it. This reverts c361ab08 and 65e16943 Change-Id: I3b9f0b1e83f9307ce8df33e33a709f799c7ef9aa