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

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