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

Change-Id: Ic5cb97cee0e2ca5a3cb1440930dbe2083f139e2e