Merge "USB: minor cleanup work" into honeycomb-mr1