Revert "Issue #80 - De-unify dom/media part 1"

This reverts commit b5b62d841c733dcb62112f3158f1488e670671d6.

dom/media/gmp/GMPDecryptorParent.cpp

@@ -4,9 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "GMPDecryptorParent.h"
-
 #include "GMPContentParent.h"
-#include "GMPUtils.h"
 #include "MediaData.h"
 #include "mozilla/Unused.h"
 

dom/media/gmp/GMPUtils.cpp

@@ -10,10 +10,8 @@
 #include "nsCOMPtr.h"
 #include "nsLiteralString.h"
 #include "nsCRTGlue.h"
-#include "mozIGeckoMediaPluginService.h"
 #include "mozilla/Base64.h"
 #include "nsISimpleEnumerator.h"
-#include "prio.h"
 
 namespace mozilla {
 

dom/media/gmp/moz.build

@@ -87,7 +87,7 @@ if CONFIG['OS_TARGET'] == 'Android':
         'rlz',
     ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'GMPAudioDecoderChild.cpp',
     'GMPAudioDecoderParent.cpp',
     'GMPAudioHost.cpp',
@@ -123,7 +123,7 @@ SOURCES += [
 ]
 
 if CONFIG['MOZ_EME']:
-    SOURCES += [
+    UNIFIED_SOURCES += [
         'GMPCDMCallbackProxy.cpp',
         'GMPCDMProxy.cpp',
     ]