Merge "Switch from libcrypto_static to libcrypto target" am: 612c12b293
am: 4c246fe5df

Change-Id: I6f49fd3560dc03de06cba7e06e039e98e55d697e