Merge "libsnapshot: OTA upgrade when vendor partition is S"