Use hlte as a common tree

Change-Id: I74d83db19ed1d103ae107689d62742a3268131b9