Revert "Move libmediahelper into a new folder."

This reverts commit c8888660b53647ef1a9608493ab1a5dc93ba9b0d.

Reason for revert: Broke elfin build

Change-Id: Idfd67b064b28abf32da332149bdce212249345d8
diff --git a/media/libaudiofoundation/Android.bp b/media/libaudiofoundation/Android.bp
index 1df0d16..e830e56 100644
--- a/media/libaudiofoundation/Android.bp
+++ b/media/libaudiofoundation/Android.bp
@@ -4,11 +4,13 @@
     export_include_dirs: ["include"],
     header_libs: [
         "libaudio_system_headers",
-        "libmedia_helper_headers",
+        "libaudioclient_headers",
+        "libmedia_headers",
     ],
     export_header_lib_headers: [
         "libaudio_system_headers",
-        "libmedia_helper_headers",
+        "libaudioclient_headers",
+        "libmedia_headers",
     ],
 }