Fix gcc 4.9.0 issues in HLT.
Merge pull request #2348 from ktf/fix-hlt-gcc490-issues

Fix gcc 4.9.0 issues in HLT.