Merge "libsnapshot: use DeleteDeviceIfExists() when required" am: f8d80b7d56 am: 29b30cba04 am: 3afd41d60f am: 03b6b1f22f
am: f00fb4493f

Change-Id: I1f7954d01a1c25a717f353f274eda3b18d72592e