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

(cherry picked from commit b3cc8e530ede38e129b2740cd51909751e9bf842)