Merge "libsnapshot: GetSnapshotExtraDeviceName" am: cc746b5193 am: 5d0acc7516 am: 0c5dfa78ae
am: 9d0fbdcec8

Change-Id: If4ee1f832d598b78a4dff063777736df1a8a7d0c