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