[coreboot-gerrit] Patch merged into coreboot/master: mb/roda/rk9: Fix cbmem recovery on resume path