fix usb tethering

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