Merge "Fix incorrect IsHeapAddress in jni entrypoints."