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

Change-Id: Ib189ff2d8ffafdc99b00086fdeb30afe049126d9