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

Change-Id: I0142405d334c5615fbc10201716d1d312b3686a9