am 54e18379: am 36084e64: Merge "Label goldfish block devices with their own types."

* commit '54e1837910cb3c40d22436bc40a7c0469df184b0':
  Label goldfish block devices with their own types.