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

(cherry picked from commit f4ef6904a73d1d63dfc75708e671ac2741742030)