Bug 1074166 - Fix device type l10n missing issue

Supposedly remove locales.ini patch had something changed in master and solved this issue, but remove locales.ini didn't land on 2.1 so we have to do this.