i777: keyfiles and extract cleanup

Change-Id: Ifcb60798294105eb9cbdc5977c81752d3a8191cd