Merge "Use libcrypto_static instead of libcrypto" am: c048c187be
am: 06b758a918

Change-Id: I7cef34166243e60df62b9ab2a1cb8de3142e4104