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

Change-Id: I8c3e889a4137f962b6a7aea1b07aefc55412badd