am 7866be2b: (-s ours) am 40bbf929: DO NOT MERGE: Backport USB accessory support to gingerbread

* commit '7866be2b76e421ca28e5dcbd3e7d362baf279dd9':
  DO NOT MERGE: Backport USB accessory support to gingerbread