Fix Skia includes around codecs

In https://skia-review.googlesource.com/c/skia/+/642658 we are
cleaning up Skia includes. These changes are necessary to address
issues from that CL or are pre-emptive for future include refactoring.

Change-Id: I8af0c7979d62f779df74065d5dd548bbc2ce31b5