Update path in proprietary-files
hltespr: fix a typo
Revert "hltespr: fix a typo"

This reverts commit 0f82a708a39831e7b873b48a2c125c44315e5bc5.
Merge remote-tracking branch 'upstream/cm-12.0' into cm-12.0