Merge "Make it easier to recognize JNI reference bugs."