hlte: Upgrade and unify all devices

Change-Id: I4ea3e1c1fe004110964c6ac36f937d17cbdd0429
d2/jf: unify devices

Change-Id: I22026b5241b2a667fcd016049d01fae59d5c87ba
Merge pull request #408 from invisiblek/consolidation

d2/jf - consolidation
Merge branch 'TheMuppets/cm-11.0'