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

This reverts commit e144e6028638a5a021c91246a9aa731202ea43ac.
hlte international: bring it up to speed with cm-12.0

Change-Id: I8cb20f5c7813cedc99e136b132fd684082b2a855
hlte: Enable temasek unofficial build tag
hlte: add SM-N900S/K to assertion

Signed-off-by: arter97 <qkrwngud825@gmail.com>