manta: Use the active branch for kernel

Change-Id: I869a7b80b1f01dc656e3f5cf0f3acd83d903091c
Merge remote-tracking branch 'cm/cm-11.0' into HEAD

Conflicts:
	cm.dependencies

Change-Id: I0c6c054c285f7342a9b5227589c1f14b8885e7ac