Getting ready for Complete Restart!

Change-Id: I3b0abd4328fc44eb69acf2088cae791d53b898a8
update loki

We're going to need the unlok functionality

Change-Id: I8f6cfaaf365b47d6fd79ac44468771529066df0f

Conflicts:

	g2.mk
recovery: Add a loki script as a recovery transformation step

This is required to support generated-from-boot recovery installations

Change-Id: I739c99d8beb01110920ed3539d92cf053623c757