libvpx: Pull from upstream

source/libvpx/test/register_state_check.h

 /*
  *  Copyright (c) 2012 The WebM project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE 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.
  */
 
@@ skipping 64 matching lines @@
   CONTEXT pre_context_;
 };
 
 #define REGISTER_STATE_CHECK(statement) do { \
   libvpx_test::RegisterStateCheck reg_check; \
   statement;                               \
 } while (false)
 
 }  // namespace libvpx_test
 
-#elif defined(CONFIG_SHARED) && defined(HAVE_NEON) && defined(CONFIG_VP9) \
-      && !CONFIG_SHARED && HAVE_NEON && CONFIG_VP9
+#elif defined(CONFIG_SHARED) && defined(HAVE_NEON_ASM) && defined(CONFIG_VP9) \
+      && !CONFIG_SHARED && HAVE_NEON_ASM && CONFIG_VP9
 
 #include "vpx/vpx_integer.h"
 
 extern "C" {
 // Save the d8-d15 registers into store.
 void vp9_push_neon(int64_t *store);
 }
 
 namespace libvpx_test {
 
@@ skipping 44 matching lines @@
 namespace libvpx_test {
 
 class RegisterStateCheck {};
 #define REGISTER_STATE_CHECK(statement) statement
 
 }  // namespace libvpx_test
 
 #endif  // _WIN64
 
 #endif  // TEST_REGISTER_STATE_CHECK_H_