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

Change-Id: I683a0a608ce7002058de5b65fe1a7ba7d00aef7b