Merge "Remove OpenSSL support"
am: 9fae4d9945

Change-Id: I64df64763f1f08f185893f25adde0b93bc5aeb24