libvpx: Pull from upstream

source/libvpx/vpx_dsp/sad.c

Index: source/libvpx/vpx_dsp/sad.c
diff --git a/source/libvpx/vpx_dsp/sad.c b/source/libvpx/vpx_dsp/sad.c
index 9db312fbe0525f07f71fc4ebed7ae44602dd745b..c0c3ff99645cb80752f746c54460ea991340fab8 100644
--- a/source/libvpx/vpx_dsp/sad.c
+++ b/source/libvpx/vpx_dsp/sad.c
@@ -14,13 +14,7 @@
 #include "./vpx_dsp_rtcd.h"
 
 #include "vpx/vpx_integer.h"
-
-#if CONFIG_VP9_HIGHBITDEPTH
-#include "vp9/common/vp9_common.h"
-#endif  // CONFIG_VP9_HIGHBITDEPTH
-// Temporary ...
-#define ROUND_POWER_OF_TWO(value, n) \
-     (((value) + (1 << ((n) - 1))) >> (n))
+#include "vpx_ports/mem.h"
 
 /* Sum the difference between every corresponding element of the buffers. */
 static INLINE unsigned int sad(const uint8_t *a, int a_stride,
@@ -39,6 +33,7 @@ static INLINE unsigned int sad(const uint8_t *a, int a_stride,
   return sad;
 }
 
+// TODO(johannkoenig): this moved to vpx_dsp, should be able to clean this up.
 /* Remove dependency on vp9 variance function by duplicating vp9_comp_avg_pred.
  * The function averages every corresponding element of the buffers and stores
  * the value in a third buffer, comp_pred.