Merge "Moving color extraction classes" into oc-dr1-dev
am: 456cb9603a

Change-Id: I6e1d6a124f9937b06648859333290f643ccc0150