fix hwcomposer defs

Change-Id: If32cf22a66cfd6dedad1469430428f5239462671
Merge remote-tracking branch 'upstream/cm-10.2' into pa4.3