fix hwc defs

Change-Id: I77611bd13739a5c578d83dc7829f736b17d64aec
Merge branch 'cm-10.2' into martincz