keys: avoid duplicating recovery keys

Setting PRODUCT_EXTRA_RECOVERY_KEYS duplicates the default key and
makes it so we can't set an extra key earlier in the build

Change-Id: I239d9994d9ad40b1779877ea2e89b55bd02e4c00
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0