Rebase from Slim and use their kernel

Change-Id: I9ebd75cfd92a2989027aba17a6b9d3958b2083bd