Merge "gralloc: Fix compilation error from crop"