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

Change-Id: I41dcd591598934c0765a24139bccf4dce27d79a4