cm: Update fingerprint/desc to latest

Change-Id: I81d2ce2872ed7534e2e1723f61c070b32575d4c8
Merge branch 'cm-11.0' into kk_mkt

Conflicts:
	mokee.mk

Change-Id: I20feb865fd41694b338907db4e2545e85260ea66