Support mass_storage mode without forcing it to be named mass_storage

Signed-off-by: Philippe De Swert <philippe.deswert@jollamobile.com>