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

* commit '9aec38fb083ae9013aab629bd8eef5f62ed749a1':
  Fix memory leak in keymaster_openssl.
tree: 376b31f20a0506c2170ca2210b6785f5782870e7
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/