Merge "libsnapshot: forward declare IImageManager"