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/Android.bp b/media/libaudiohal/Android.bp
index f4d41e5..7ecb9d8 100644
--- a/media/libaudiohal/Android.bp
+++ b/media/libaudiohal/Android.bp
@@ -19,7 +19,7 @@
     ],
 
     header_libs: [
-        "libaudiohal_headers",
+        "libaudiohal_headers"
     ]
 }
 
@@ -50,11 +50,4 @@
     name: "libaudiohal_headers",
 
     export_include_dirs: ["include"],
-
-    header_libs: [
-        "libaudiohal_legacy_headers",
-    ],
-    export_header_lib_headers: [
-        "libaudiohal_legacy_headers",
-    ],
 }