Disable all NEON in BoringSSL if has_broken_neon is set.

crypto/openssl_util.cc

Index: crypto/openssl_util.cc
diff --git a/crypto/openssl_util.cc b/crypto/openssl_util.cc
index 48ec3e2e3936bb3acefb736743c297a8ec78c29b..410cab5a88872ef4e47f11b9d227cec0a180a224 100644
--- a/crypto/openssl_util.cc
+++ b/crypto/openssl_util.cc
@@ -48,13 +48,12 @@ class OpenSSLInitSingleton {
 #if defined(OS_ANDROID) && defined(ARCH_CPU_ARMEL)
     const bool has_neon =
         (android_getCpuFeatures() & ANDROID_CPU_ARM_FEATURE_NEON) != 0;
-    // CRYPTO_set_NEON_capable is called before |SSL_library_init| because this
-    // stops BoringSSL from probing for NEON support via SIGILL in the case
-    // that getauxval isn't present.
-    CRYPTO_set_NEON_capable(has_neon);
-    // See https://code.google.com/p/chromium/issues/detail?id=341598
     base::CPU cpu;
-    CRYPTO_set_NEON_functional(!cpu.has_broken_neon());
+    // CRYPTO_set_NEON_capable is called before |SSL_library_init| because this
+    // stops BoringSSL from probing for NEON support via SIGILL in the case that
+    // getauxval isn't present. Also workaround a CPU with broken NEON
+    // support. See https://code.google.com/p/chromium/issues/detail?id=341598
+    CRYPTO_set_NEON_capable(has_neon && !cpu.has_broken_neon());
 #endif
 
     SSL_library_init();