Reverted new VilleC2 GPU driver and some upstream USB changes