am e61495c9: am 2ab2e110: am bc836220: Merge "SWAP_FLAG_* constants are now in <sys/swap.h>."

* commit 'e61495c9b82e0bb4893095405518c23a55092f3a':
  SWAP_FLAG_* constants are now in <sys/swap.h>.