recovery: remove custom recovery_keys

Change-Id: Ie3e10049c83f8589e1b62af6d2fb75eaee824366
Merge remote-tracking branch 'upstream/cm-11.0' into HEAD