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

This reverts commit 49c56de516b4e9556ae1b0af0ccfa7d695f5807b.

Reason for revert: Breaks the build of multiple devices

Change-Id: Iebd868467948b8afa5907462ccc0720cd9c4871e
diff --git a/audio/effect/all-versions/default/Android.bp b/audio/effect/all-versions/default/Android.bp
index 47d74a8..ed2a093 100644
--- a/audio/effect/all-versions/default/Android.bp
+++ b/audio/effect/all-versions/default/Android.bp
@@ -9,6 +9,7 @@
     shared_libs: [
         "libbase",
         "libcutils",
+        "libeffects",
         "libfmq",
         "libhidlbase",
         "libhidlmemory",
@@ -20,7 +21,9 @@
     ],
 
     header_libs: [
+        "libaudio_system_headers",
         "libaudioclient_headers",
+        "libeffects_headers",
         "libhardware_headers",
         "libmedia_headers",
         "android.hardware.audio.common.util@all-versions",