Fix hlte varients and add de-unified d2

Change-Id: Ief6dd57764e23b850e34c834b2b50611fa30979c