move loki from msm8960-common

Change-Id: I8735ac14f841eaeb04198a8b0771db660817f70d
Merge branch 'cm' into HEAD