hltexx: Fix build and cleanup

Change-Id: I16e9487eae9d79398d402f600d5316616e6fa7c2