Fixes for libusbx on AOSP.