Merge m-c to mozilla-inbound. r=bustage-fix a=bustage-fix on a CLOSED TREE

python/mozbuild/mozbuild/frontend/emitter.py

@@ -110,7 +110,6 @@ ALLOWED_XPCOM_GLUE = {
     ('test_audio', 'media/libcubeb/tests'),
     ('test_latency', 'media/libcubeb/tests'),
     ('test_sanity', 'media/libcubeb/tests'),
-    ('TestMinStringAPI', 'xpcom/tests/external'),
     ('testcomponent', 'xpcom/tests/component'),
     ('test656331', 'xpcom/tests/bug656331_component'),
     ('testcompnoaslr', 'xpcom/tests/component_no_aslr'),
@@ -154,7 +153,6 @@ ALLOWED_XPCOM_GLUE = {
     ('jsep_track_unittest', 'media/webrtc/signaling/test'),
     ('mediaconduit_unittests', 'media/webrtc/signaling/test'),
     ('mediapipeline_unittest', 'media/webrtc/signaling/test'),
-    ('sdp_file_parser', 'media/webrtc/signaling/fuzztest'),
     ('sdp_unittests', 'media/webrtc/signaling/test'),
     ('signaling_unittests', 'media/webrtc/signaling/test'),
     ('TestMailCookie', 'mailnews/base/test'),