am 5bc9b5c2: am 9aec38fb: Merge "Fix memory leak in keymaster_openssl."

* commit '5bc9b5c295cf157db65bcd834afb3fd508edae2a':
  Fix memory leak in keymaster_openssl.
tree: 33a7da821dc26e0a226d53f34e95d7ec267032d9
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/