Merge "Require USB Accessory Features" into honeycomb-mr1