serrano: Remove custom recovery keys

 * Depends on http://review.cyanogenmod.org/#/c/62724/

Change-Id: Ia6a25daed0517afde1e2e28fccc3bbc1d6962852
Merge branch 'cm-11.0' into kk_mkt