philz: Update and use custom recovery keys.
boardconfig: Set recovery variant

-Using cwm for this branch.
patcher upgrades
Revert "boardconfig: Set recovery variant"

This reverts commit edcd134b77483648d8347d663b1f82c74b7dfd61.
Merge branch 'carbon' into twrp