Merge "Clean up the locking in usb_linux.cpp."