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

Change-Id: I12980dcc8ea7b809b87199e9d7959202a7abc385