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

* commit '6d98e0cdfba102db95e9cf69a58ebbee65c510ee':

Change-Id: I9ad01681eb2420e0c5798db97a26cc6fe4b3f015