MFH: r481274 r481319 r481885

Fix build with openssl 1.1.1

PR: 228867
Submitted by: brnrd@freebsd.org

Revert r481274, it broke ports depending on neon

PR: 228867
With hat: portmgr
Reported by: pkg-fallout

Second try to fix OpenSSL 1.1.1 build.

PR: 228867
Submitted by: jkim@FreeBSD.org