Merge "Remove usb HIDL entry in compat matrix."