diff --git a/media/libyuv/libyuv.gyp b/media/libyuv/libyuv.gyp
index 60776580e794..27a37b8d37d9 100644
--- a/media/libyuv/libyuv.gyp
+++ b/media/libyuv/libyuv.gyp
@@ -65,6 +65,11 @@
             '-mfpu=vfpv3-d16',
             # '-mthumb',  # arm32 not thumb
           ],
+          'cflags_mozilla!': [
+            '-mfpu=vfp',
+            '-mfpu=vfpv3',
+            '-mfpu=vfpv3-d16',
+          ],
           'conditions': [
             # Disable LTO in libyuv_neon target due to gcc 4.9 compiler bug.
             ['clang == 0 and use_lto == 1', {
@@ -79,6 +84,9 @@
                 '-mfpu=neon',
                 # '-marm',  # arm32 not thumb
               ],
+              'cflags_mozilla': [
+                '-mfpu=neon',
+              ],
             }],
           ],
         }],
diff --git a/media/webrtc/signaling/test/common.build b/media/webrtc/signaling/test/common.build
index 61a2ddb7b56c..f34f96335ffc 100644
--- a/media/webrtc/signaling/test/common.build
+++ b/media/webrtc/signaling/test/common.build
@@ -89,11 +89,6 @@ USE_LIBS += [
     'zlib',
 ]
 
-if CONFIG['BUILD_ARM_NEON']:
-    USE_LIBS += [
-        'yuv_neon',
-    ]
-
 if CONFIG['JS_SHARED_LIBRARY']:
     USE_LIBS += [
         'js',