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

* commit '8827b8a75eb858ae3778fb491b136a4a029107a4':
  HWC2: Fix breakage from header change

Change-Id: I282f18bdaccc9c792ec967775bf4779f6d91ed2c