Merge "dumpstate: Dump device-mapper info via gsid." am: 8bfaf9f3b5
am: 2b2600f5d7

Change-Id: I0e91ada09eb9c7d832d66def4d735953332afd56