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

Change-Id: I8b8fc3057e8a4c175bef286d642cdae38dacc908