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

(cherry picked from commit 6ba3780ddbf8fad27e200d9e508cbaa593e963b3)