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