* Remove kernel includes * Fix warning/info/debug tags Change-Id: Ibdf18b15bdf025fbbab4b2c3ba2670b253f2edb7