Merge "Remove pixel format conversion functions from jni"