Revert "boardconfig: Set recovery variant"

This reverts commit edcd134b77483648d8347d663b1f82c74b7dfd61.
Merge remote-tracking branch 'meticulus/carbon' into cm-11.0