--- a/dom/media/moz.build
+++ b/dom/media/moz.build
@@ -210,17 +210,16 @@ UNIFIED_SOURCES += [
     'AudioTrack.cpp',
     'AudioTrackList.cpp',
     'BaseMediaResource.cpp',
     'Benchmark.cpp',
     'CanvasCaptureMediaStream.cpp',
     'ChannelMediaDecoder.cpp',
     'ChannelMediaResource.cpp',
     'CloneableWithRangeMediaResource.cpp',
-    'CubebUtils.cpp',
     'DOMMediaStream.cpp',
     'FileBlockCache.cpp',
     'FileMediaResource.cpp',
     'GetUserMediaRequest.cpp',
     'GraphDriver.cpp',
     'Latency.cpp',
     'MediaCache.cpp',
     'MediaContainerType.cpp',
@@ -273,18 +272,21 @@ if CONFIG['OS_TARGET'] == 'WINNT':
       'AudioNotificationSender.h',
   ]
   SOURCES += [
       'AudioNotificationReceiver.cpp',
       'AudioNotificationSender.cpp',
       'ThreadPoolCOMListener.cpp',
   ]
 
+# CubebUtils.cpp needs to be built separately due to what appears to be some kind
+# of compiler bug on Android 4.2 x86 opt. See bug 1408459.
 # DecoderTraits.cpp needs to be built separately because of Mac OS X headers.
 SOURCES += [
+    'CubebUtils.cpp',
     'DecoderTraits.cpp',
 ]
 
 # Some codec-related code uses multi-character constants, which GCC and clang
 # warn about. Suppress turning this warning into an error.
 if CONFIG['GNU_CC'] or CONFIG['CLANG_CL']:
   SOURCES['DecoderTraits.cpp'].flags += ['-Wno-error=multichar']