Merge "Switch from libcrypto_static to libcrypto target"
am: 4ad5256547

Change-Id: Iba529dac6e8c3fc62e0f6a700604299fa9e1f629