Merge "Link libcrypto dynamically for recovery unit tests." am: 54100d3348
am: 97fee1c3b2

Change-Id: I1c839029b1e967234d1c181eb30b9638a42cd4e3