libvpx: Pull from upstream

source/libvpx/vp9/encoder/vp9_variance.h

Index: source/libvpx/vp9/encoder/vp9_variance.h
===================================================================
--- source/libvpx/vp9/encoder/vp9_variance.h	(revision 207064)
+++ source/libvpx/vp9/encoder/vp9_variance.h	(working copy)
@@ -86,18 +86,18 @@
     vp9_sad_multi_d_fn_t       sdx4df;
 } vp9_variance_fn_ptr_t;
 
-static void comp_avg_pred(uint8_t *comp_pred, const uint8_t *pred, int weight,
+static void comp_avg_pred(uint8_t *comp_pred, const uint8_t *pred, int width,
                           int height, uint8_t *ref, int ref_stride) {
   int i, j;
 
   for (i = 0; i < height; i++) {
-    for (j = 0; j < weight; j++) {
+    for (j = 0; j < width; j++) {
       int tmp;
       tmp = pred[j] + ref[j];
       comp_pred[j] = (tmp + 1) >> 1;
     }
-    comp_pred += weight;
-    pred += weight;
+    comp_pred += width;
+    pred += width;
     ref += ref_stride;
   }
 }