Merge "Use libcrypto_static instead of libcrypto" am: 2a62d42704
am: 60b634a0e4

Change-Id: Ic5f5479413b8dc2a7dffd127b3e8535149ae8614