Merge "Modify UsbDeviceManager stack to allow MtpServer to use FunctionFS drivers."