Merge "gadget: f_mass_storage: Don't force name to be mass_storage"