Updates to make hwcomposer compile with GPU challenge cahnges

Change-Id: Iebd106a0edaa72bec02a56f2435dc858708658f8