Merge "Remove color extraction from scrims" into qt-dev
am: a4d6b7801c

Change-Id: I1f6caa6d008f6b3e37fdd0b582a659d32c91d3cc