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

Change-Id: I5b5678085b9906881230803fe1c7425f407e2df1
Merge remote-tracking branch 'cm/cm-11.0' into HEAD