Fix build error from diamond merge

Somehow between various merges on master and oc-dr1-dev
master ended up in bad state.
CL's involved are:
cd939aa6 Fix build for non-HWC2 targets (master)
281e8113 Communicate composition buffer dataspace to HWC (oc-dr1-dev)
79d27244 Communicate composition buffer dataspace to HWC (master)
I think 281e got merged into master and re-introduced the change that
was fixed by cd93.
Test: make

Change-Id: I087244348392098f516905eb1cebebf0362fcc20
(cherry picked from commit 6461806d)