Merge "Minor cleanup in gralloc"