e980: Update to use new loki

Change-Id: I0c9c14712da194e489b4ca5d5de730a29930343e
Merge branch 'cm-11.0' into kk_mkt