Revert "Refactor HTC proprietary vendor"

This reverts commit 82e2261487f63ff1250cefa918c19f689e5282fa.
Update htc props
Signed-off-by: igio90 <giovanni.rocca.90@gmail.com>