Change Kernel back to CM

Change-Id: I80ca94a8f3d466a7ab3bc4f2f86b97e59e93caf5