Merge "Generic JNI implementation for x86_64"