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

This reverts commit fc9e212f018ce41430ec8dcebc3cae3c346474bb.

Reason for revert: Breaks multiple devices

Change-Id: I816671fd92246f85c97d00819858a74e36e2929d
diff --git a/modules/audio_remote_submix/Android.bp b/modules/audio_remote_submix/Android.bp
index 578949e..c7d018c 100644
--- a/modules/audio_remote_submix/Android.bp
+++ b/modules/audio_remote_submix/Android.bp
@@ -17,15 +17,16 @@
     relative_install_path: "hw",
     vendor: true,
     srcs: ["audio_hw.cpp"],
-
+    include_dirs: [
+        "system/media/audio_utils/include",
+    ],
     shared_libs: [
         "liblog",
         "libcutils",
         "libutils",
-        "libnbaio_mono@2.0",
-        "libaudioutils",
+        "libnbaio_mono",
     ],
-    static_libs: ["libmedia_helper@2.0"],
+    static_libs: ["libmedia_helper"],
 
     cflags: ["-Wno-unused-parameter"],