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

Change-Id: Ia771484ba1ce6e84e3a87086c35fc0bf133a3b48