Revert "Vivo: Refresh kernel includes"

This reverts commit b3ae91b1adeb4f7636e9be42a0b9f7866823029f.