Fix building for USB

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