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

* commit '2e7908b58cf8696a89940e3e8eee119c64ea824d':
  Move usb_osx to C++.