Revert "hlte: Update a few paths"

This reverts commit 10c6dad554e887ee611bc319fb31a31f94265d51.

Change-Id: If0757e380c91d4cebdbc432bd74460fe736d8a8b
Merge remote-tracking branch 'upstream/cm-11.0' into berserk