Merge "Revert "Use CRYPTO_memcmp from OpenSSL rather than memcmp_s."" into mnc-dev