Merge "Add skia/src/codec to core/jni include dirs"