Merge "gpu_tonemapper: Fix compilation issue with GraphicBuffer"