Merge "libsnapshot_test: Fix loading both the static and dynamic libcrypto libs" am: 92155132e2
am: da79719fce

Change-Id: I0b437ac0400be8e4d79a889a2dccd88c9fb9fed2