Fix merge failure from 'zswap, frontswap, vnswap: extract and backport to Nexus series'