Merge "libsnapshot: correct DeviceInfo paths"