libvpx: Pull from upstream

source/libvpx/build/make/configure.sh

Index: source/libvpx/build/make/configure.sh
===================================================================
--- source/libvpx/build/make/configure.sh	(revision 293588)
+++ source/libvpx/build/make/configure.sh	(working copy)
@@ -805,7 +805,12 @@
           ;;
         armv7|armv7s)
           soft_enable neon
-          soft_enable neon_asm
+          # Only enable neon_asm when neon is also enabled.
+          enabled neon && soft_enable neon_asm
+          # If someone tries to force it through, die.
+          if disabled neon && enabled neon_asm; then
+            die "Disabling neon while keeping neon-asm is not supported"
+          fi
           soft_enable media
           soft_enable fast_unaligned
           ;;
@@ -1118,7 +1123,7 @@
       bits=32
       enabled x86_64 && bits=64
       check_cpp <<EOF && bits=x32
-#ifndef __ILP32__
+#if !defined(__ILP32__) || !defined(__x86_64__)
 #error "not x32"
 #endif
 EOF
@@ -1267,9 +1272,6 @@
     check_cc <<EOF && INLINE="inline"
 static inline function() {}
 EOF
-    check_cc <<EOF && INLINE="__inline__ __attribute__((always_inline))"
-static __attribute__((always_inline)) function() {}
-EOF
 
   # Almost every platform uses pthreads.
   if enabled multithread; then