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

* commit 'fce9f9cfce0549703e3ee79bc143ce6736b520a3':
  HWC2: Fix breakage from header change

Change-Id: Ia891a07108bbefc8bd2782e74a86e41cf164124d