Revert "hlte: Break apart tmo/can variants due to NFC differences."

This reverts commit e144e6028638a5a021c91246a9aa731202ea43ac.