e980: Update to use new loki

Change-Id: I0c9c14712da194e489b4ca5d5de730a29930343e
Merge remote-tracking branch 'cm/cm-11.0' into HEAD

Conflicts:
	device.mk

Change-Id: Ibef748e17dbc6fb02bb86c163fe541cff013f051