Merge "Revert^4 "JIT JNI stubs.""