Revert "hwc: Fix klockwork errors"

This reverts commit 2b80a9cf0debb0bdd58bd7f641660b5faf3eaf7c.