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

* commit '450c4ad097673111965d9143dbc6671778c0b00c':
  toolbox: enable mkswap to work on block devices