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

Change-Id: I9b6d3b08685a3a0a7f2555419a7f3255600adebc