Merge remote branch 'internal/upstream' into HEAD

diff --cc vp8/vp8_common.mk
index f06ad42f9c82ff3dc5daeef6ccbedb8c271b38cd,acc9334f475834d1306f1e7aaac71244ae01f785..7dd9684019598ebdb27b87999a803a08cf0f0a59
--- 1/vp8/vp8_common.mk
--- 2/vp8/vp8_common.mk
+++ b/vp8/vp8_common.mk
@@@ -99,20 -99,15 +99,20 @@@ VP8_COMMON_SRCS-$(HAVE_MMX) += common/x
  VP8_COMMON_SRCS-$(HAVE_SSE2) += common/x86/postproc_sse2.asm
  endif
  
+ # common (c)
  VP8_COMMON_SRCS-$(ARCH_ARM)  += common/asm_com_offsets.c
 +ifeq ($(CONFIG_CSM),yes)
 +VP8_COMMON_SRCS-yes += common/maskingmv.c
 +VP8_COMMON_SRCS-$(HAVE_SSE3) += common/x86/mask_sse3.asm
 +endif
 +
  VP8_COMMON_SRCS-$(ARCH_ARM)  += common/arm/arm_systemdependent.c
  
- # common (c)
- VP8_COMMON_SRCS-$(HAVE_ARMV6)  += common/arm/bilinearfilter_arm.c
- VP8_COMMON_SRCS-$(HAVE_ARMV6)  += common/arm/bilinearfilter_arm.h
- VP8_COMMON_SRCS-$(HAVE_ARMV6)  += common/arm/filter_arm.c
- VP8_COMMON_SRCS-$(HAVE_ARMV6)  += common/arm/loopfilter_arm.c
- VP8_COMMON_SRCS-$(HAVE_ARMV6)  += common/arm/reconintra_arm.c
+ VP8_COMMON_SRCS-$(ARCH_ARM)  += common/arm/bilinearfilter_arm.c
+ VP8_COMMON_SRCS-$(ARCH_ARM)  += common/arm/bilinearfilter_arm.h
+ VP8_COMMON_SRCS-$(ARCH_ARM)  += common/arm/filter_arm.c
+ VP8_COMMON_SRCS-$(ARCH_ARM)  += common/arm/loopfilter_arm.c
+ VP8_COMMON_SRCS-$(ARCH_ARM)  += common/arm/reconintra_arm.c
  
  # common (armv6)
  VP8_COMMON_SRCS-$(HAVE_ARMV6)  += common/arm/armv6/bilinearfilter_v6$(ASM)