update loki

We're going to need the unlok functionality

Change-Id: I8f6cfaaf365b47d6fd79ac44468771529066df0f
recovery: Add a loki script as a recovery transformation step

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

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