n7000: keyfiles and extract cleanup

Change-Id: I62459f26a68e60d584b76f7cbfeff3dd643ceb36
n7000: add ext4 as second filesystem for sdcard for recovery

Change-Id: I743ed0de7629a8b90ab144a184ef13ecc5c69731
Merge remote-tracking branch 'CM/cm-10.1' into jellybean