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

Change-Id: Ice8eb59b11540040b3732855d8b83ca82bdec0ec