Merge "USB: android: Fix a NULL pointer dereference"