Merge "toolbox: enable mkswap to work on block devices"