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

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