libusbx & spongycastle
Merge upstream