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

Change-Id: If964f99327d63ac62b7900b92791051e06c55747