Revert "Revert "recovery_keys: update for CWM API changes""

This reverts commit 56d45297ef97365dca3a18759a655d1d16039d46.