Merge "Remove non-standard memswap."