Merge "x86_64: Fix issue in JNI compiler"