Replace vp9_common_dspr2.h with common_dspr2.h

Narrow the scope of dependency in dspr2 loop filter implementation.

Change-Id: I30426d7e4d41575a82286f1d3c5881aeb99a3250
diff --git a/vp9/common/mips/dspr2/vp9_loopfilter_filters_dspr2.c b/vp9/common/mips/dspr2/vp9_loopfilter_filters_dspr2.c
index 3df7f4c..41be900 100644
--- a/vp9/common/mips/dspr2/vp9_loopfilter_filters_dspr2.c
+++ b/vp9/common/mips/dspr2/vp9_loopfilter_filters_dspr2.c
@@ -14,10 +14,10 @@
 #include "vp9/common/vp9_common.h"
 #include "vp9/common/vp9_loopfilter.h"
 #include "vp9/common/vp9_onyxc_int.h"
-#include "vp9/common/mips/dspr2/vp9_common_dspr2.h"
 #include "vp9/common/mips/dspr2/vp9_loopfilter_macros_dspr2.h"
 #include "vp9/common/mips/dspr2/vp9_loopfilter_masks_dspr2.h"
 #include "vp9/common/mips/dspr2/vp9_loopfilter_filters_dspr2.h"
+#include "vpx_dsp/mips/common_dspr2.h"
 
 #if HAVE_DSPR2
 void vp9_lpf_horizontal_4_dspr2(unsigned char *s,
diff --git a/vp9/common/mips/dspr2/vp9_mbloop_loopfilter_dspr2.c b/vp9/common/mips/dspr2/vp9_mbloop_loopfilter_dspr2.c
index 7cd0b63..93fbc27 100644
--- a/vp9/common/mips/dspr2/vp9_mbloop_loopfilter_dspr2.c
+++ b/vp9/common/mips/dspr2/vp9_mbloop_loopfilter_dspr2.c
@@ -14,10 +14,10 @@
 #include "vp9/common/vp9_common.h"
 #include "vp9/common/vp9_loopfilter.h"
 #include "vp9/common/vp9_onyxc_int.h"
-#include "vp9/common/mips/dspr2/vp9_common_dspr2.h"
 #include "vp9/common/mips/dspr2/vp9_loopfilter_macros_dspr2.h"
 #include "vp9/common/mips/dspr2/vp9_loopfilter_masks_dspr2.h"
 #include "vp9/common/mips/dspr2/vp9_loopfilter_filters_dspr2.h"
+#include "vpx_dsp/mips/common_dspr2.h"
 
 #if HAVE_DSPR2
 void vp9_lpf_horizontal_8_dspr2(unsigned char *s,
diff --git a/vp9/common/mips/dspr2/vp9_mblpf_horiz_loopfilter_dspr2.c b/vp9/common/mips/dspr2/vp9_mblpf_horiz_loopfilter_dspr2.c
index 6c94674..5dc86fe 100644
--- a/vp9/common/mips/dspr2/vp9_mblpf_horiz_loopfilter_dspr2.c
+++ b/vp9/common/mips/dspr2/vp9_mblpf_horiz_loopfilter_dspr2.c
@@ -14,10 +14,10 @@
 #include "vp9/common/vp9_common.h"
 #include "vp9/common/vp9_loopfilter.h"
 #include "vp9/common/vp9_onyxc_int.h"
-#include "vp9/common/mips/dspr2/vp9_common_dspr2.h"
 #include "vp9/common/mips/dspr2/vp9_loopfilter_macros_dspr2.h"
 #include "vp9/common/mips/dspr2/vp9_loopfilter_masks_dspr2.h"
 #include "vp9/common/mips/dspr2/vp9_loopfilter_filters_dspr2.h"
+#include "vpx_dsp/mips/common_dspr2.h"
 
 #if HAVE_DSPR2
 void vp9_lpf_horizontal_16_dspr2(unsigned char *s,
diff --git a/vp9/common/mips/dspr2/vp9_mblpf_vert_loopfilter_dspr2.c b/vp9/common/mips/dspr2/vp9_mblpf_vert_loopfilter_dspr2.c
index 851fc6c..65ea49a 100644
--- a/vp9/common/mips/dspr2/vp9_mblpf_vert_loopfilter_dspr2.c
+++ b/vp9/common/mips/dspr2/vp9_mblpf_vert_loopfilter_dspr2.c
@@ -14,10 +14,10 @@
 #include "vp9/common/vp9_common.h"
 #include "vp9/common/vp9_loopfilter.h"
 #include "vp9/common/vp9_onyxc_int.h"
-#include "vp9/common/mips/dspr2/vp9_common_dspr2.h"
 #include "vp9/common/mips/dspr2/vp9_loopfilter_macros_dspr2.h"
 #include "vp9/common/mips/dspr2/vp9_loopfilter_masks_dspr2.h"
 #include "vp9/common/mips/dspr2/vp9_loopfilter_filters_dspr2.h"
+#include "vpx_dsp/mips/common_dspr2.h"
 
 #if HAVE_DSPR2
 void vp9_lpf_vertical_16_dspr2(uint8_t *s,