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

* commit '36084e64a1b603f0ca848bba5ca91938f853dc4c':
  Label goldfish block devices with their own types.