Merge "SWAP_FLAG_* constants are now in <sys/swap.h>."