Revert "    hwc : Compilation issue fix."

This reverts commit c7b287043d98fdc05873c243a58a29c437568112.