Revert "audioserver: enable HIDL callbacks"

This reverts commit e2afa1eba5.

Bug: 31748996
Bug: 67203473
Test: build
Change-Id: Ic048423ffa186ed0249a005180a08626bc30b5f2

media/audioserver/Android.mk

@@ -16,8 +16,7 @@ LOCAL_SHARED_LIBRARIES := \
 	libmedialogservice \
 	libnbaio \
 	libsoundtriggerservice \
-	libutils \
-	libhwbinder
+	libutils
 
 # TODO oboeservice is the old folder name for aaudioservice. It will be changed.
 LOCAL_C_INCLUDES := \

media/audioserver/main_audioserver.cpp

@@ -27,10 +27,6 @@
 #include <binder/IServiceManager.h>
 #include <utils/Log.h>
 
-// FIXME: remove when BUG 31748996 is fixed
-#include <hwbinder/IPCThreadState.h>
-#include <hwbinder/ProcessState.h>
-
 // from LOCAL_C_INCLUDES
 #include "aaudio/AAudioTesting.h"
 #include "AudioFlinger.h"
@@ -145,10 +141,6 @@ int main(int argc __unused, char **argv)
 
         SoundTriggerHwService::instantiate();
         ProcessState::self()->startThreadPool();
-
-// FIXME: remove when BUG 31748996 is fixed
-        android::hardware::ProcessState::self()->startThreadPool();
-
         IPCThreadState::self()->joinThreadPool();
     }
 }