Unified kernel with CM jf kernel

Change-Id: I1e65313afcd94ca36dd572892efc2288ce0cfabf