Merge "libsnapshot_test: Fix running on DSUs." am: 984aa655df

Change-Id: I5b8df0b32a0b247f163182b7cad34809bc6b0107