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

Change-Id: I201ba0f3988676ed9999f973bfd3c40cf14eb69f