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

(cherry picked from commit 2660f07b404129c0fa87520f3fae4014fee3f0d4)

Conflicts:
	config/common.mk