Reverted to using the CM kernel

Change-Id: I2d0b994cecfc3683d80b4bf9b8aab25d547a0088