fix hwc defs

Change-Id: Ia903866f808a218fcb9dcc8e13f67eed9774d671