Move kernel lines from common, change defconfig

Change-Id: Ib656fb2be82556119226e4c4a5339af8e5f6eb78