hltevzw: Moved some dependencies around

Change-Id: I9b50c34ca3eaada8728220a9718e472da88faf52