am 9fffd9a8: Merge "USB: minor cleanup work" into honeycomb-mr1

* commit '9fffd9a8bb73e9b225878686862d49b27e98c659':
  USB: minor cleanup work