Additional fixes for Cid

Some devices were incorrect used. An extra override was also added.

BTW, this error was showing up when choosing t0ltecdma:

** Don't have a product spec for: 'cm_t0ltecdma'
** Do you have the right repo manifest?

So I didn't include the build variant.

Adds override for HTC One devices.

Fixes Cid failing for changes coming from translators with special names.