Unify HLTE

Change-Id: Idff00602d5a4f6e7d0ae8444cf27cee5b8f29301
Merge "Unify HLTE" into kitkat