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

(cherry picked from commit 1f8b6ffd282172b59fb7fac8f39d856662667a7a)