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

Change-Id: Ifaf8c9fdd89fa74b5d073cbd27503d2d8f05c23b
tree: 777d9c6c922075a4177c78b34cf39f0c9cae6165
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/
  4. MODULE_LICENSE_APACHE2
  5. NOTICE