Merge "Switch from libcrypto_static to libcrypto target" am: 612c12b293 am: 4c246fe5df am: 25eacb0b5e  -s ours
am: 6a137e087f

Change-Id: I06a612f700d65f1b3f357be21e17bb8f973f9e4f