Change Kernel back to CM

Change-Id: Ie34ec8913069b745bdf8d7e83f6006f3d2560275