Snap for 5166612 from b94cc009432f0b1c0e7b18ce3812580a56ff8d0f to pi-b4s4-release

Change-Id: Ib2bccbc6c71105922bf4c0b692495743b50f818a
diff --git a/usbd/usbd.cpp b/usbd/usbd.cpp
index 191fb92..41cd8dd 100644
--- a/usbd/usbd.cpp
+++ b/usbd/usbd.cpp
@@ -22,20 +22,15 @@
 #include <android-base/properties.h>
 #include <android/hardware/usb/gadget/1.0/IUsbGadget.h>
 
-#include <hidl/HidlTransportSupport.h>
-
 #define PERSISTENT_USB_CONFIG "persist.sys.usb.config"
 
 using android::base::GetProperty;
 using android::base::SetProperty;
-using android::hardware::configureRpcThreadpool;
 using android::hardware::usb::gadget::V1_0::GadgetFunction;
 using android::hardware::usb::gadget::V1_0::IUsbGadget;
 using android::hardware::Return;
 
 int main(int /*argc*/, char** /*argv*/) {
-    configureRpcThreadpool(1, true /*callerWillJoin*/);
-
     android::sp<IUsbGadget> gadget = IUsbGadget::getService();
     Return<void> ret;