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

Change-Id: I603ce4e9487ffdd0d97d83cb01cbe0e91dd40c77