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

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

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

Bug: skia:6839
Bug: skia:8052
As with the original, no API change

Change-Id: Ic744a610e9f431707f871de44f9f64040bc60d14
Reviewed-by: Leon Scroggins <>
Commit-Queue: Leon Scroggins <>
diff --git a/images/mandrill_cmyk.jpg b/images/mandrill_cmyk.jpg
deleted file mode 100644
index 0a7f29b..0000000
--- a/images/mandrill_cmyk.jpg
+++ /dev/null
Binary files differ