Merge "gralloc: fix warnings"