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

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

Change-Id: I05e5ac7285d232074ac336611cbc14643aac9f6e