libvpx: Pull from upstream

source/libvpx/vp8/encoder/x86/quantize_sse2.c

Index: source/libvpx/vp8/encoder/x86/quantize_sse2.c
diff --git a/source/libvpx/vp8/encoder/x86/quantize_sse2.c b/source/libvpx/vp8/encoder/x86/quantize_sse2.c
index 291d21992fe7aede5c26edaca3b7180ac49f3df2..b4e92e04b22006115f1c15bcc3d4a807b3e75c24 100644
--- a/source/libvpx/vp8/encoder/x86/quantize_sse2.c
+++ b/source/libvpx/vp8/encoder/x86/quantize_sse2.c
@@ -35,10 +35,10 @@
 void vp8_regular_quantize_b_sse2(BLOCK *b, BLOCKD *d)
 {
     char eob = 0;
-    short *zbin_boost_ptr  = b->zrun_zbin_boost;
+    short *zbin_boost_ptr;
     short *qcoeff_ptr      = d->qcoeff;
-    DECLARE_ALIGNED_ARRAY(16, short, x, 16);
-    DECLARE_ALIGNED_ARRAY(16, short, y, 16);
+    DECLARE_ALIGNED(16, short, x[16]);
+    DECLARE_ALIGNED(16, short, y[16]);
 
     __m128i sz0, x0, sz1, x1, y0, y1, x_minus_zbin0, x_minus_zbin1;
     __m128i quant_shift0 = _mm_load_si128((__m128i *)(b->quant_shift));
@@ -55,7 +55,7 @@ void vp8_regular_quantize_b_sse2(BLOCK *b, BLOCKD *d)
     __m128i dequant0 = _mm_load_si128((__m128i *)(d->dequant));
     __m128i dequant1 = _mm_load_si128((__m128i *)(d->dequant + 8));
 
-    vpx_memset(qcoeff_ptr, 0, 32);
+    memset(qcoeff_ptr, 0, 32);
 
     /* Duplicate to all lanes. */
     zbin_extra = _mm_shufflelo_epi16(zbin_extra, 0);