Merge "Add support for USB accessory serial numbers" into honeycomb-mr1