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

Change-Id: I25c13a77f3d748c331eeeecac9eed4fed15eb754