Merge "Add libsnapshot_test to presubmit" am: a6bc86aae7 am: 666989df73

Change-Id: I35d059739332fa0490df96bf0b19a8c618363137