Merge "libsnapshot: MapCowImage returns the COW device path" am: 2c7ae59ede
am: 11792adea5

Change-Id: I80ac830122ff416339463d7028ae332d637d04d4