Merge "libsnapshot: correct DeviceInfo paths" am: f9d5327287
am: a716e1d0ff

Change-Id: Icbdf83c548b6ce09f14e7b909dc1c10ba98b8ccd