dwc3: Revert dwc3 changes for now.

Change-Id: I221001cca269522de05747636338a202227a9a22
Merge branch into kk_mkt