libwep: cherry-pick fix for compilation to arm64

third_party/libwebp/dsp/dsp.h

 // Copyright 2011 Google Inc. All Rights Reserved.
 //
 // Use of this source code is governed by a BSD-style license
 // that can be found in the COPYING file in the root of the source
 // tree. An additional intellectual property rights grant can be found
 // in the file PATENTS. All contributing project authors may
 // be found in the AUTHORS file in the root of the source tree.
 // -----------------------------------------------------------------------------
 //
 //   Speed-critical functions.
@@ skipping 18 matching lines @@
 #endif
 
 #if defined(__SSE2__) || defined(WEBP_MSC_SSE2)
 #define WEBP_USE_SSE2
 #endif
 
 #if defined(__ANDROID__) && defined(__ARM_ARCH_7A__)
 #define WEBP_ANDROID_NEON  // Android targets that might support NEON
 #endif
 
-#if defined(__ARM_NEON__) || defined(WEBP_ANDROID_NEON)
+#if (defined(__ARM_NEON__) && !defined(__aarch64__)) || \
+    defined(WEBP_ANDROID_NEON)
 #define WEBP_USE_NEON
 #endif
 
 typedef enum {
   kSSE2,
   kSSE3,
   kNEON
 } CPUFeature;
 // returns true if the CPU supports the feature.
 typedef int (*VP8CPUInfo)(CPUFeature feature);
@@ skipping 165 matching lines @@
 void WebPInitPremultiplySSE2(void);   // should not be called directly.
 void WebPInitPremultiplyNEON(void);
 
 //------------------------------------------------------------------------------
 
 #ifdef __cplusplus
 }    // extern "C"
 #endif
 
 #endif  /* WEBP_DSP_DSP_H_ */