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

Change-Id: I2a1dc3bb94f85fb3eed740e74de4a71cd721f2e5