--- a/media/libvpx/Makefile.in
+++ b/media/libvpx/Makefile.in
@@ -10,21 +10,16 @@ ASM_SUFFIX=$(VPX_ASM_SUFFIX)
 
 ifdef VPX_ARM_ASM
 # Building on an ARM platform with a supported assembler, include
 # the optimized assembly in the build.
 
 ifeq ($(OS_TARGET),Android)
 # For cpu-features.h
 LOCAL_INCLUDES += -I$(ANDROID_NDK)/sources/android/cpufeatures
-ifndef MOZ_WEBRTC
-# For cpu-features.c
-VPATH += $(ANDROID_NDK)/sources/android/cpufeatures
-CSRCS += cpu-features.c
-endif
 endif
 
 ASM_OFFSETS = vpx_scale_asm_offsets.asm vp8_asm_enc_offsets.asm
 
 
 ifdef VPX_AS_CONVERSION
 # The ARM asm is written in ARM RVCT syntax, but we actually build it with
 # gas using GNU syntax. Add some rules to perform the conversion.

--- a/media/libvpx/moz.build
+++ b/media/libvpx/moz.build
@@ -77,8 +77,13 @@ if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
 FINAL_LIBRARY = 'gkmedias'
 
 DEFINES['HAVE_CONFIG_H'] = 'vpx_config.h'
 
 if CONFIG['OS_TARGET'] == 'Android':
     # Older versions of the Android NDK don't pre-define anything to indicate
     # the OS they're on, so do it for them.
     DEFINES['__linux__'] = True
+
+    if not CONFIG['MOZ_WEBRTC']:
+        SOURCES += [
+            '%s/sources/android/cpufeatures/cpu-features.c' % CONFIG['ANDROID_NDK'],
+        ]