Fix ColorMatrix performance and correctness issues.

bug 10427746

Change-Id: Ie42753a551badf4de3144f16fa0e407eca5b9c74
2 files changed