Merge change 24426 into eclair

* changes:
  keystore: remove "#include <openssl/engine.h>".