Merge "libsnapshot: forward declare IImageManager" am: bb89da85c4
am: 7543201add

Change-Id: I78488374aed4bab60d4604585866fe393f41d44b