Merge "libsnapshot: Do not map snapshots for partitions that were reflashed." am: f5960a1ac7
am: 07012f8ba8

Change-Id: If8e08233d06795543ff945a43d4138b8574435bb