Merge "libsnapshot: Refactor CreateLogicalAndSnapshotPartitions" am: dccd6b3389 am: 362853af1a
am: ed32bf163b

Change-Id: Iae82b2753fd28064d7039748092f0e5ed560bc8a