move loki to msm8960-common

Change-Id: Ib053a337d70477a8e3012adb4ab4e21f75d97649
Merge remote-tracking branch 'cm/cm-10.1' into gerrit