Merge "libsnapshot: GetSnapshotExtraDeviceName" am: cc746b5193
am: 5d0acc7516

Change-Id: I2036e3697c1542afca8cbfd76d20e3a79c6db314