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

Change-Id: I8b16e53c2cddf013332ac542939a4cbf0641e91a