Merge "Revert "Revert "Revert "JIT JNI stubs.""""