Merge branch 'cm-11.0' of git://github.com/CyanogenMod/android_vendor_cm into cd-4.4

Conflicts:
	prebuilt/common/bootanimation/480.zip

Change-Id: If4d0e8319d19fe0cf8e8779c639bc293c1619742