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

Change-Id: I9ce0fee59122e8590eb512c6daaf9abc4bfa07f3