Revert "move loki from msm8960-common"

This reverts commit 1176881eeaa00023b0dd5d33dd0edca57c18b3d1.