Merge "libsnapshot: Call EnsureImageManager before RemoveAllImages"
am: fea51309dc

Change-Id: I8cd5c865ad3db873e07f8d3d89f9d00b59fbf4ec