Merge "surfaceflinger: fix tone mapper GLSL errors" into pi-dev