move loki to msm8960-common

Change-Id: Ib053a337d70477a8e3012adb4ab4e21f75d97649
Merge branch 'cm-10.1' of github.com:CyanogenMod/android_device_samsung_jfltevzw into jb2