Merge "libsnapshot_test: Fix running on DSUs." into rvc-dev am: a0e4932ccb am: 2c3cdf755d

Change-Id: If01760a546e63f32b20dcf7eb1edd700c773a0d1