am 6e58f4a9: am a4802ca0: Merge "Move usb_osx to C++."

* commit '6e58f4a96b4e32a1b688b112b78e9372a965b393':
  Move usb_osx to C++.