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

Change-Id: Ia332c50ecb6268c1607e211eef3a3e97eca8bbd7