* commit '78b8e1be97c61f7e0b28b145fadd0c646fd1c46b': DO NOT MERGE: backport recent USB accessory changes from honeycomb