xla

Remove or simplify hardcoded lists of device types

#6235

Merged