Merge change 8516 into donut

* changes:
  Refactor API classes to support both, WinUsb and Legacy API