Merge "librecoverymap: Fix lifecycle of recovery map decoder"