Merge branch 'master' into experimental

Conflicts:
	vp9/vp9_common.mk

Change-Id: I2cd5ab47dc31c4210cefc23a282102123d5e2221

diff --cc vp9/common/x86/vp9_loopfilter_intrin_sse2.c
Simple merge

diff --cc vp9/vp9_common.mk
index ea86317,714cefd..5e1ff62
--- 1/vp9/vp9_common.mk
--- 2/vp9/vp9_common.mk
+++ b/vp9/vp9_common.mk
@@@ -111,15 -112,21 +112,15 @@@ VP9_COMMON_SRCS-yes += common/vp9_maski
  VP9_COMMON_SRCS-$(HAVE_SSE3) += common/x86/vp9_mask_sse3.asm
  endif
  
 -VP9_COMMON_SRCS-$(HAVE_SSE4_1) += common/x86/vp9_filter_sse4.c
 -ifeq ($(HAVE_SSE4_1),yes)
 -vp9/common/x86/vp9_filter_sse4.c.o: CFLAGS += -msse4
 -vp9/common/x86/vp9_filter_sse4.c.d: CFLAGS += -msse4
 -endif
 -
 -VP9_COMMON_SRCS-$(HAVE_SSE2) += common/x86/vp9_filter_sse2.c
 +VP9_COMMON_SRCS-$(ARCH_X86)$(ARCH_X86_64) += common/x86/vp9_idct_x86.c
- VP9_COMMON_SRCS-$(HAVE_SSE2) += common/x86/vp9_sadmxn_x86.c
+ VP9_COMMON_SRCS-$(HAVE_SSE2) += common/x86/vp9_sadmxn_sse2.c
  ifeq ($(HAVE_SSE2),yes)
 -vp9/common/x86/vp9_filter_sse2.c.o: CFLAGS += -msse2
 +vp9/common/x86/vp9_idct_x86.c.o: CFLAGS += -msse2
- vp9/common/x86/vp9_loopfilter_x86.c.o: CFLAGS += -msse2
- vp9/common/x86/vp9_sadmxn_x86.c.o: CFLAGS += -msse2
+ vp9/common/x86/vp9_loopfilter_intrin_sse2.c.o: CFLAGS += -msse2
+ vp9/common/x86/vp9_sadmxn_sse2.c.o: CFLAGS += -msse2
 -vp9/common/x86/vp9_filter_sse2.c.d: CFLAGS += -msse2
 +vp9/common/x86/vp9_idct_x86.c.d: CFLAGS += -msse2
- vp9/common/x86/vp9_loopfilter_x86.c.d: CFLAGS += -msse2
- vp9/common/x86/vp9_sadmxn_x86.c.d: CFLAGS += -msse2
+ vp9/common/x86/vp9_loopfilter_intrin_sse2.c.d: CFLAGS += -msse2
+ vp9/common/x86/vp9_sadmxn_sse2.c.d: CFLAGS += -msse2
  endif
  
  $(eval $(call asm_offsets_template,\