update loki

We're going to need the unlok functionality

Change-Id: I8f6cfaaf365b47d6fd79ac44468771529066df0f

Conflicts:

	g2.mk