Just write the ICCP chunk after VP8X instead of forcing VP8X first. Move the code from after_vp8() because it's only called from one place.