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

This reverts commit c246f5eaa1dabda72eb3bcf3823d4cab65bd4e83.

Reason for revert: Breaks the build of multiple devices

Change-Id: I516d7467369f9a9b9872e7378c8b2eabc8b1d96e
diff --git a/post_proc/Android.mk b/post_proc/Android.mk
index 3bd47db..c31b769 100644
--- a/post_proc/Android.mk
+++ b/post_proc/Android.mk
@@ -34,10 +34,10 @@
 
 LOCAL_C_INCLUDES := \
 	external/tinyalsa/include \
+	$(call include-path-for, audio-effects)
 
 LOCAL_HEADER_LIBRARIES += libhardware_headers
 LOCAL_HEADER_LIBRARIES += libsystem_headers
-LOCAL_HEADER_LIBRARIES += android.hardware.audio.effect.legacy@2.0
 include $(BUILD_SHARED_LIBRARY)
 endif
 
@@ -66,10 +66,10 @@
 
 LOCAL_C_INCLUDES := \
         hardware/qcom/audio/hal \
+	$(call include-path-for, audio-effects)
 
 LOCAL_HEADER_LIBRARIES += libhardware_headers
 LOCAL_HEADER_LIBRARIES += libsystem_headers
-LOCAL_HEADER_LIBRARIES += android.hardware.audio.effect.legacy@2.0
 include $(BUILD_SHARED_LIBRARY)
 
 endif