libgralloc: fix mismerge

Change-Id: I9edf2fccf9b4406166f2188232e03c0fe8f5a157