recovery: Clean ALL the things

 * We need to clean everything, otherwise nasty things happen when
   switching to alternate recovery module.

Change-Id: I9ea88179f5329112c587b649328c1c83df0bd5d9
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2