cm: Update fingerprint/desc to latest

Change-Id: I81d2ce2872ed7534e2e1723f61c070b32575d4c8
Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_device_oneplus_bacon into HEAD

Conflicts:
	cm.mk

Change-Id: I7a2e21e34980cc1133a89a122297c6cd408901b0