commit 33d5394d08f645a9f612ba96115acb0e8408a97c
author Leon Scroggins III <scroggo@google.com> Wed Aug 22 16:46:32 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Aug 22 21:13:50 2018 +0000
tree 7d7bda5a01ae73caa31c25b48a6b6f488532b8ae
parent 45bc27aff2c9f7c4e674fce979292b76f1f4068e

Revert "Switch SkCodec to use skcms" and follow on change

This reverts commit 81886e8f9461c7049751c6a2c194a1df632dd362 and
f8ae5ce20cf6df2dab4149fb2838d9d8dc6bd1af
("Fix CMYK handling in JPEG codec")

This fixes the Android build, which was failing a CTS test with this
change.

Bug: skia:6839
Bug: skia:8052

TBR=djsollen@google.com
As with the original, no API change

Change-Id: Ic744a610e9f431707f871de44f9f64040bc60d14
Reviewed-on: https://skia-review.googlesource.com/148810
Reviewed-by: Leon Scroggins <scroggo@google.com>
Commit-Queue: Leon Scroggins <scroggo@google.com>