Merge "DO NOT MERGE: Backport more USB accessory changes from honeycomb" into gingerbread