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

* commit 'b66ee0e7d1553fc1e99abe72407914c18590490c':

Change-Id: I8753accf37084e31ec600b49d116e8f68410e3e5