Merge "libsnapshot/test: Re-enable the failing tests" am: 4bd1f92e0b

Change-Id: I058829bee51069091267060279be311a12a962b2