Merge "display: compilation fix in gralloc"