move loki to msm8960

Change-Id: Ibc4118797df0c34438de78c2f24d891a94babb75
Merge branch 'cm-10.1' of github.com:CyanogenMod/android_device_samsung_jf-common into jb2