am b13581a9: (-s ours) am 1110748b: DO NOT MERGE: USB accessory support library

* commit 'b13581a9dab07ccd1841890e0443b9cfe0805679':
  DO NOT MERGE: USB accessory support library