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

Change-Id: I5e499045158788cfab4eddb7bf80d39b087e8040