Merge "DO NOT MERGE: backport recent USB accessory changes from honeycomb" into gingerbread