Merge "libsnapshot: add snapshotctl" am: 71667636fb
am: 57ee82cd7b

Change-Id: I8908298588e20c492cbb81276e2147450ee7eaee