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

(cherry picked from commit 1ee40d30f5c55022d19ac74432a574c1f80f8d89)

Conflicts:
	config/common_full.mk