Merge "Remove static dependency on usb gadget aidl libs"