hlte: fix merge fail.

Change-Id: I3fe9ea6cf195611a6599485a557cf7544722c4e0