Merge "support TARGET_EXTRA_RECOVERY_KEYS"