Merge branch 'cm-10.2' of github.com:CyanogenMod/android_system_core into kk4.4