Merge "Remove OpenSSL support" am: 9fae4d9945
am: aaf91922b6

Change-Id: Ifaf8c9fdd89fa74b5d073cbd27503d2d8f05c23b