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

* commit '9aec38fb083ae9013aab629bd8eef5f62ed749a1':
  Fix memory leak in keymaster_openssl.