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

Change-Id: I2ec136302a039b4e3ee051304b058525053e4662