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

(cherry picked from commit b6d6a7dc01badc58a3684380112190a1bcd2a0be)