Merge "Combine the USB accessory support library with the platform feature"