Revert "Audio V4: Split system and vendor Audio.h"

This reverts commit f8ad7f85e9891b2614338330c75ae9e946fccc5a.

Reason for revert: Breaks the build of multiple devices

Change-Id: I24f17a0fa0c7ba171c4a3639f890e7f4e42f6b1e
diff --git a/media/libaudiohal/2.0/EffectHalHidl.cpp b/media/libaudiohal/2.0/EffectHalHidl.cpp
index 87b1b41..4fb032c 100644
--- a/media/libaudiohal/2.0/EffectHalHidl.cpp
+++ b/media/libaudiohal/2.0/EffectHalHidl.cpp
@@ -18,6 +18,7 @@
 //#define LOG_NDEBUG 0
 
 #include <hwbinder/IPCThreadState.h>
+#include <media/EffectsFactoryApi.h>
 #include <utils/Log.h>
 
 #include "ConversionHelperHidl.h"