am 3c9aa1aa: (-s ours) am b0976320: Merge "DO NOT MERGE: Backport more USB accessory changes from honeycomb" into gingerbread

* commit '3c9aa1aa093ff8acc5ec71190a35b9ab04d64fda':
  DO NOT MERGE: Backport more USB accessory changes from honeycomb