am 9dad4ec4: Merge "Clean up the locking in usb_linux.cpp."

* commit '9dad4ec4408bf412c265ac9bb27c84bb5098e67c':
  Clean up the locking in usb_linux.cpp.