Merge "init.rc: Add support for new USB accessory configurations"