Merge "surfaceflinger: fix color tranform matrix races" into pi-dev am: 72128ee8d9
am: 625354bb2a

Change-Id: I577b8d6e012bf1cb84c5e0a4c3720dd62065b239