Update things to build kernel inline

Change-Id: Ie5bb260448cec40d9fdcb49efc4f51f2b304481a