am 54de3e91: am 34d68c2b: Merge "Switch usb_linux_client to C++."

* commit '54de3e91df6553072c0d5f3192b73c1aad4220c8':
  Switch usb_linux_client to C++.