libvpx: Pull from upstream

source/libvpx/vp8/encoder/encodeintra.c

Index: source/libvpx/vp8/encoder/encodeintra.c
diff --git a/source/libvpx/vp8/encoder/encodeintra.c b/source/libvpx/vp8/encoder/encodeintra.c
index cfa4cb927f617d7b95590e219de14e1c66a88d26..e2de5eecbc460cc941e2f6799f4d50314c06c9ce 100644
--- a/source/libvpx/vp8/encoder/encodeintra.c
+++ b/source/libvpx/vp8/encoder/encodeintra.c
@@ -11,6 +11,7 @@
 
 #include "vpx_config.h"
 #include "vp8_rtcd.h"
+#include "./vpx_dsp_rtcd.h"
 #include "quantize.h"
 #include "vp8/common/reconintra4x4.h"
 #include "encodemb.h"
@@ -44,7 +45,7 @@ int vp8_encode_intra(VP8_COMP *cpi, MACROBLOCK *x, int use_dc_pred)
         }
     }
 
-    intra_pred_var = vp8_get_mb_ss(x->src_diff);
+    intra_pred_var = vpx_get_mb_ss(x->src_diff);
 
     return intra_pred_var;
 }