P880: Fix deprecated syntax of USB

Change-Id: I99e14d2092744d36357c7d17a53053e2a7d3f278
Merge remote-tracking branch 'cm/cm-11.0' into HEAD