Merge "usb: gadget: mass_storage: added sysfs entry for cdrom to LUNs" into cm-10.1