Merge "UsbGadget AIDL migration cleanup"