Revert "Revert "Move libmediahelper into a new folder.""

This reverts commit a0877dc731067dd95635b2be3e893f1fe60bf3a1.

Reason for revert: Should work with go/pag/1465463 merging to master.

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