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

* commit '16068830444361ab65cbc9804b76e2d415aff9a2':
  toolbox: enable mkswap to work on block devices