Revert r97185 "Update libvpx snapshot to v0.9.7-p1 (Cayuga)."

libvpx/source/libvpx/vp8/encoder/arm/variance_arm.h

Index: libvpx/source/libvpx/vp8/encoder/arm/variance_arm.h
diff --git a/libvpx/source/libvpx/vp8/encoder/arm/variance_arm.h b/libvpx/source/libvpx/vp8/encoder/arm/variance_arm.h
index f2f761f9ef6195dab1788f2aefbe5d05bea1695c..86de274762fcefbaf7759523b8016bc427e40e97 100644
--- a/libvpx/source/libvpx/vp8/encoder/arm/variance_arm.h
+++ b/libvpx/source/libvpx/vp8/encoder/arm/variance_arm.h
@@ -83,7 +83,10 @@ extern prototype_variance(vp8_variance_halfpixvar16x16_hv_neon);
 
 //extern prototype_getmbss(vp8_get_mb_ss_c);
 extern prototype_variance(vp8_mse16x16_neon);
-extern prototype_get16x16prederror(vp8_get4x4sse_cs_neon);
+extern prototype_sad(vp8_get16x16pred_error_neon);
+//extern prototype_variance2(vp8_get8x8var_c);
+//extern prototype_variance2(vp8_get16x16var_c);
+extern prototype_sad(vp8_get4x4sse_cs_neon);
 
 #if !CONFIG_RUNTIME_CPU_DETECT
 #undef  vp8_variance_sad4x4
@@ -146,6 +149,15 @@ extern prototype_get16x16prederror(vp8_get4x4sse_cs_neon);
 #undef  vp8_variance_mse16x16
 #define vp8_variance_mse16x16 vp8_mse16x16_neon
 
+#undef  vp8_variance_get16x16prederror
+#define vp8_variance_get16x16prederror vp8_get16x16pred_error_neon
+
+//#undef  vp8_variance_get8x8var
+//#define vp8_variance_get8x8var vp8_get8x8var_c
+
+//#undef  vp8_variance_get16x16var
+//#define vp8_variance_get16x16var vp8_get16x16var_c
+
 #undef  vp8_variance_get4x4sse_cs
 #define vp8_variance_get4x4sse_cs vp8_get4x4sse_cs_neon
 #endif