Merge "libsnapshot: Track the source slot across reboots." am: 6ecedd2040
am: 49ea4d955f

Change-Id: Iabe212c5caf35a8245f0bb33cae64b8629591e29