i9100: keyfiles and extract cleanup

Change-Id: Ic1c9a6ff3364f7d37577144ba805bbbae7350ef6
Merge "i9100: keyfiles and extract cleanup" into jb-mr1