Merge "HWC2: Fix breakage from header change" into nyc-dev
am: 80bc52aefa

* commit '80bc52aefa56e590f05bc30ff0182d860f00b128':
  HWC2: Fix breakage from header change

Change-Id: I02f8b45ded3d00dc2d34689f5b902d77ee74ca1e