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

Change-Id: Ic21c173870d6df43c264e432b05fb7069ce8fff8