Merge "Use shared libcrypto" am: 6dc75fb0cd
am: ed69d38540

Change-Id: I839568fec0e1c0961de085c08679c2d89cf15a87