Merge "Support for USB accessory URIs" into honeycomb-mr1