t6-common: clean up the recovery

Change-Id: I2ce6869e33e3366ae79429dce8bb59d8dddb89cb
Merge "t6-common: clean up the recovery" into cm-11.0