Merge changes I2cff6070,I5b59a3fc

* changes:
  stagefright: remove O-ABI specific requirements from ColorUtils
  stagefright: define ColorUtils enums independently from graphics HAL